- Timestamp:
- 01/04/11 17:13:38 (17 months ago)
- Location:
- HelpIM3/branches/chatgroups/HelpIM
- Files:
-
- 2 modified
-
bot/bot.py (modified) (1 diff)
-
chatgroup/db/services.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
HelpIM3/branches/chatgroups/HelpIM/bot/bot.py
r1374 r1375 698 698 return False 699 699 roomname = self.room_state.room_jid.as_unicode() 700 from datetime import datetime 701 user.left_at = datetime.now() 702 self.site.session.flush() 700 room = self.get_helpim_room() 701 702 groupServices.setChatgroupMeetingParticipantLeft( 703 self.site, 704 room.chat_id, 705 user.nick) 706 703 707 if self.userkicked == user.nick or self.closingDown: 704 708 self.userkicked = '' 705 709 log.notice("Kicked user '%s' has left room '%s'." % (user.nick, roomname)) 706 710 return False 707 room = self.get_helpim_room() 711 708 712 status = room.getStatus() 709 713 nUsers = len(self.room_state.users) -1 # -1 for not counting the bot itself -
HelpIM3/branches/chatgroups/HelpIM/chatgroup/db/services.py
r1372 r1375 168 168 """ ChatgroupMeetingParticipant """ 169 169 170 def getChatgroupMeetingParticipantsByMeetingId(self, site, meeting_id, is_admin=None ):170 def getChatgroupMeetingParticipantsByMeetingId(self, site, meeting_id, is_admin=None, raiseError=False): 171 171 session = site.database.getSession() 172 172 query = session.query(ChatgroupMeetingParticipant).filter_by(meeting_id=meeting_id) … … 179 179 if raiseError: 180 180 raise 181 181 182 def setChatgroupMeetingParticipantLeft(self, site, meeting_id, nickname, raiseError=False): 183 try: 184 from datetime import datetime 185 participant = site.session.query(ChatgroupMeetingParticipant).filter_by(meeting_id=meeting_id).filter_by(conv_participant_name=nickname).one() 186 participant.left_at = datetime.now() 187 site.session.flush() 188 except NoResultFound: 189 if raiseError: 190 raise 182 191 183 192 def getChatgroupMeetingByMember(self, site, member):
