Changeset 104
Legend:
- Unmodified
- Added
- Removed
-
adventure/adventuremuc.py
r103 r104 115 115 116 116 if __name__ == '__main__': 117 if len argv!= 4:117 if len(argv) != 4: 118 118 print 'Syntax: ./adventuremuc.py <JID> <Password> <Host> <Port>' 119 119 print 'See README for further help' -
adventure/thing.py
r103 r104 2 2 3 3 from player import Player 4 from xmpp import Presence 4 5 5 6 class Thing: … … 25 26 xe = None 26 27 #for pres in each_element('presence'): 27 # xe = Jabber::Presence.import(pres)28 # xe = Presence(node=pres) 28 29 #if isinstance(self, Player): 29 30 # xe.add(Jabber::MUC::XMUCUser.new).add(Jabber::MUC::XMUCUserItem.new('none', 'participant')) -
adventure/world.py
r103 r104 54 54 # Broadcast unavailability presence to leaver 55 55 if t.presence: 56 pres = Jabber::Presence.import(t.presence)56 pres = Presence(node=t.presence) 57 57 pres.setType('unavailable') 58 58 pres.SetTo(thing.jid) … … 62 62 # Broadcast unavailability presence to all who are here 63 63 if thing.presence: 64 pres = Jabber::Presence.import(thing.presence)64 pres = Presence(node=thing.presence) 65 65 pres.setType('unavailable') 66 66 pres.setTo(t.jid) … … 75 75 # Broadcast availability presence to enterer 76 76 if t.presence: 77 pres = Jabber::Presence.import(t.presence)77 pres = Presence(node=t.presence) 78 78 pres.setTo(thing.jid) 79 79 self.send(t.name, pres) … … 81 81 # Broadcast availability presence to all who are here 82 82 if thing.presence: 83 pres = Jabber::Presence.import(thing.presence)83 pres = Presence(node=thing.presence) 84 84 pres.setTo(t.jid) 85 85 self.send(thing.name, pres) … … 101 101 # A help for the irritated first: 102 102 if pres.getType() == 'subscribe': 103 msg = Message(pres. from)103 msg = Message(pres.getFrom()) 104 104 msg.type = 'normal' 105 105 msg.subject = 'Adventure component help' … … 111 111 player = None 112 112 for thing in self.things.values(): 113 if thing.kind_of?(Player) && pres.to.resource == thing.iname:113 if isinstance(thing, Player) and pres.getTo().getResource() == thing.name: 114 114 player = thing 115 115 116 116 # Disallow nick changes 117 if thing.kind_of?(Player) && (pres.from == thing.jid) &&(player != thing):117 if isinstance(thing, Player) and (pres.getFrom() == thing.jid) and (player != thing): 118 118 answer = pres.answer(false) 119 answer. type = :error120 answer.add(Jabber::Error.new('not-acceptable', 'Nickchange not allowed'))121 send(thing. iname, answer)119 answer.setType('error') 120 #answer.add(Jabber::Error.new('not-acceptable', 'Nickchange not allowed')) 121 send(thing.name, answer) 122 122 return True 123 123 124 124 # Either nick-collission or empty nick 125 if not (player.nil? || pres.from == player.jid) && (pres.to.resource.to_s.size > 1):125 if player and pres.getFrom() != player.jid and len(pres.getTo().getResource()): 126 126 answer = pres.answer 127 answer .type = :error128 if (pres.to.resource.to_s.size > 1):127 answersetType('error') 128 if len(pres.getTo().getResource()): 129 129 answer.add(Jabber::Error::new('conflict', 'Nickname already used')) 130 130 else: 131 131 answer.add(Jabber::Error::new('not-acceptable', 'Please use a nickname')) 132 send( nil, answer)132 send(None, answer) 133 133 return True 134 134 … … 145 145 for t in each_thing_by_place(player.place): 146 146 # Broadcast presence to all who are here 147 pres = Jabber::Presence.import(player.presence)147 pres = Presence(node=player.presence) 148 148 pres.to = t.jid 149 149 send(player.iname, pres) … … 211 211 if what.lower() in thing.aliases: 212 212 for action in thing.actions: 213 for c in action.expressions 213 for c in action.expressions: 214 214 if c == cmd: 215 215 thing.command(player, action, words)
