1
=== modified file 'ibid.ini'
2
--- ibid.ini	2009-05-31 08:10:44 +0000
3
+++ ibid.ini	2009-07-07 15:35:05 +0000
4
@@ -12,9 +12,13 @@
5
12
        type = irc
12
        type = irc
6
13
        server = za.atrum.org
13
        server = za.atrum.org
7
14
        modes = B
14
        modes = B
8
15
# 	     nickserv_password = password
9
16
        nickserv_mask = services@atrum.org
10
15
    [[freenode]]
17
    [[freenode]]
11
16
        type = irc
18
        type = irc
12
17
        server = chat.eu.freenode.net
19
        server = chat.eu.freenode.net
13
20
# 	     nickserv_password = password
14
21
        nickserv_mask = NickServ@services.
15
18
        disabled = True
22
        disabled = True
16
19
    [[jabber]]
23
    [[jabber]]
17
20
        ssl = True
24
        ssl = True
18
@@ -55,7 +59,7 @@
19
55
        object_path = /org/ibid/module/Ping
59
        object_path = /org/ibid/module/Ping
20
56
    [[core]]
60
    [[core]]
21
57
        names = $botname, bot, ant
61
        names = $botname, bot, ant
23
58
        ignore = NickServ,
62
        ignore = ,
24
59
    [[bzr]]
63
    [[bzr]]
25
60
        source = atrum
64
        source = atrum
26
61
        channel = "#ibid"
65
        channel = "#ibid"
27
@@ -77,3 +81,5 @@
28
77
81
29
78
[databases]
82
[databases]
30
79
    ibid = sqlite:///ibid.db
83
    ibid = sqlite:///ibid.db
31
84
32
85
# vi: set et sta sw=4 ts=4:
33
80
86
34
=== modified file 'ibid/config.ini'
35
--- ibid/config.ini	2009-04-17 23:49:41 +0000
36
+++ ibid/config.ini	2009-07-06 14:13:24 +0000
37
@@ -17,7 +17,7 @@
38
17
    cachedir = /tmp/ibid
17
    cachedir = /tmp/ibid
39
18
    [[core]]
18
    [[core]]
40
19
        names = $botname, bot, ant
19
        names = $botname, bot, ant
42
20
        ignore = NickServ,
20
        ignore = ,
43
21
21
44
22
[databases]
22
[databases]
45
23
    ibid = sqlite:///ibid.db
23
    ibid = sqlite:///ibid.db
46
24
24
47
=== modified file 'ibid/plugins/irc.py'
48
--- ibid/plugins/irc.py	2009-03-16 20:55:20 +0000
49
+++ ibid/plugins/irc.py	2009-07-07 15:45:24 +0000
50
@@ -1,7 +1,12 @@
51
1
"""Administrative commands for IRC"""
1
"""Administrative commands for IRC"""
52
2
2
53
3
from fnmatch import fnmatch
54
4
import logging
55
5
56
3
import ibid
6
import ibid
58
4
from ibid.plugins import Processor, match, authorise
7
from ibid.plugins import Processor, match, handler, authorise
59
8
60
9
log = logging.getLogger('plugins.irc')
61
5
10
62
6
help = {"irc": u"Provides commands for joining/parting channels on IRC and Jabber, and changing the bot's nick"}
11
help = {"irc": u"Provides commands for joining/parting channels on IRC and Jabber, and changing the bot's nick"}
63
7
12
64
@@ -60,4 +65,30 @@
65
60
            source.change_nick(nick)
65
            source.change_nick(nick)
66
61
            event.addresponse(u'Changing nick to %s', nick)
66
            event.addresponse(u'Changing nick to %s', nick)
67
62
67
68
68
class NickServ(Processor):
69
69
    event_types = ('notice',)
70
70
71
71
    def is_nickserv(self, event):
72
72
        source_cfg = ibid.config['sources'][event.source]
73
73
        return (event.sender.get('nick') ==
74
74
                    source_cfg.get(u'nickserv_nick', u'NickServ') and
75
75
                fnmatch(event.sender['connection'].split('!', 1)[1],
76
76
                    source_cfg.get(u'nickserv_mask', '*')
77
77
        ))
78
78
79
79
    @match(r'^(?:This nickname is registered\. Please choose a different nickname'
80
80
            r'|This nickname is registered and protected\.  If it is your'
81
81
            r'|If this is your nickname, type \/msg NS)')
82
82
    def auth(self, event):
83
83
        if self.is_nickserv(event):
84
84
            source_cfg = ibid.config['sources'][event.source]
85
85
            if u'nickserv_password' in source_cfg:
86
86
                event.addresponse(u'IDENTIFY %s', source_cfg[u'nickserv_password'])
87
87
88
88
    @match(r'^(?:You are now identified for'
89
89
            r'|Password accepted -+ you are now recognized)')
90
90
    def success(self, event):
91
91
        if self.is_nickserv(event):
92
92
            log.info(u'Authenticated with NickServ')
93
93
94
63
# vi: set et sta sw=4 ts=4:
94
# vi: set et sta sw=4 ts=4:
95
64
95
96
=== modified file 'ibid/plugins/log.py'
97
--- ibid/plugins/log.py	2009-07-04 23:45:41 +0000
98
+++ ibid/plugins/log.py	2009-07-06 14:16:40 +0000
99
@@ -20,6 +20,8 @@
100
20
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d <%(sender_nick)s> %(message)s')
20
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d <%(sender_nick)s> %(message)s')
101
21
    action_format = Option('action_format', 'Format string for actions',
21
    action_format = Option('action_format', 'Format string for actions',
102
22
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d  * %(sender_nick)s %(message)s')
22
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d  * %(sender_nick)s %(message)s')
103
23
    notice_format = Option('notice_format', 'Format string for notices',
104
24
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d -%(sender_nick)s- %(message)s')
105
23
    presence_format = Option('presence_format', 'Format string for presence events',
25
    presence_format = Option('presence_format', 'Format string for presence events',
106
24
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d %(sender_nick)s (%(sender_connection)s) is now %(state)s')
26
            u'%(year)d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d %(sender_nick)s (%(sender_connection)s) is now %(state)s')
107
25
    logs = {}
27
    logs = {}
108
@@ -50,13 +52,14 @@
109
50
        return self.logs[filename][0]
52
        return self.logs[filename][0]
110
51
53
111
52
    def log_event(self, event):
54
    def log_event(self, event):
113
53
        if event.type in ('message', 'state', 'action'):
55
        if event.type in ('message', 'state', 'action', 'notice'):
114
54
            when = localtime(event.time)
56
            when = localtime(event.time)
115
55
57
116
56
            format = {
58
            format = {
117
57
                    'message': self.message_format,
59
                    'message': self.message_format,
118
58
                    'state': self.presence_format,
60
                    'state': self.presence_format,
119
59
                    'action': self.action_format,
61
                    'action': self.action_format,
120
62
                    'notice': self.notice_format,
121
60
                }[event.type]
63
                }[event.type]
122
61
64
123
62
            fields = {
65
            fields = {
Reviewer	Date Requested	Status
Michael Gorven		Approve on 2009-07-07
Jonathan Hitchcock	2009-07-07	Approve on 2009-07-07
Review via email: mp+8318@code.launchpad.net