pyva: De-duplicate join/part code across modules

[irc/rizon/acid.git] / pyva / pyva / src / main / python / trivia / trivia.py

diff --git a/pyva/pyva/src/main/python/trivia/trivia.py b/pyva/pyva/src/main/python/trivia/trivia.py
index 562d067e6c7e0cbf02c98ad9af7cbf7e4a61e86f..f9f630009d75c7217ea6f5f68f1b847e2ab82041 100644 (file)
--- a/pyva/pyva/src/main/python/trivia/trivia.py
+++ b/pyva/pyva/src/main/python/trivia/trivia.py
@@ -22,7 +22,6 @@ import cmd_admin, sys_auth, trivia_engine
 import pyva_net_rizon_acid_core_Acidictive as Acidictive
 import pyva_net_rizon_acid_core_AcidCore as AcidCore
 import pyva_net_rizon_acid_core_User as User
-import pyva_net_rizon_acid_core_Channel as Channel
 
 class trivia(
        AcidPlugin,
@@ -144,15 +143,11 @@ class trivia(
                self.trivias.clear()
 
        def join(self, channel):
-               me = User.findUser(self.nick)
-               me.joinChan(channel)
+               super(trivia, self).join(channel)
                self.dbp.execute("INSERT IGNORE INTO trivia_chans(name) VALUES(%s)", (str(channel),))
 
        def part(self, channel):
-               me = User.findUser(self.nick)
-               chan = Channel.findChannel(channel)
-               if chan:
-                       me.partChan(chan)
+               super(trivia, self).part(channel)
 
                self.stop_trivia(channel, True)
                self.dbp.execute("DELETE FROM trivia_chans WHERE name=%s", (str(channel),))