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