Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/commands.py b/commands.py
- index 6b6aee2..efc9aca 100644
- --- a/commands.py
- +++ b/commands.py
- @@ -159,7 +159,7 @@ class BoardAdminCmd(default_cmds.MuxCommand):
- board.save()
- return
- - self.msg("Unknown switch. Please see {555help " + self.cmdstring + "{n for help.")
- + self.msg("Unknown switch. Please see |555help " + self.cmdstring + "|n for help.")
- class BoardCmd(default_cmds.MuxCommand):
- @@ -233,7 +233,7 @@ class BoardCmd(default_cmds.MuxCommand):
- self.msg("The post identifier '" + readargs[1] + "' must be a positive integer!")
- return None
- - board = DefaultBoard.objects.get_visible_board(self.player, boardname)
- + board = DefaultBoard.objects.get_visible_board(self.account, boardname)
- if not board:
- self.msg("Unable to find a board matching '" + string + "'!")
- return None
- @@ -241,7 +241,7 @@ class BoardCmd(default_cmds.MuxCommand):
- if len(readargs) == 1:
- return {"board": board, "post": None, "postnum": 0}
- - posts = board.posts(self.player)
- + posts = board.posts(self.account)
- if not (0 < postnum <= len(posts)):
- self.msg("There's no post by that number.")
- @@ -254,7 +254,7 @@ class BoardCmd(default_cmds.MuxCommand):
- # This is overly long, and could potentially use a refactor to split the switches out
- # into their own functions.
- def func(self):
- - caller = self.player
- + caller = self.account
- boards = DefaultBoard.objects.get_all_visible_boards(caller)
- shortcut = False
- @@ -447,9 +447,9 @@ class BoardCmd(default_cmds.MuxCommand):
- self.msg("You don't have permission to post to " + board.name + "!")
- return
- - postplayer = self.player
- + postplayer = self.account
- postobject = None
- - postname = self.player.name
- + postname = self.account.name
- if self.caller is Object or self.caller is Character:
- postobject = self.caller
- @@ -499,9 +499,9 @@ class BoardCmd(default_cmds.MuxCommand):
- while post.db_parent:
- post = post.db_parent
- - postplayer = self.player
- + postplayer = self.account
- postobject = None
- - postname = self.player.name
- + postname = self.account.name
- if self.caller is Object or self.caller is Character:
- postobject = self.caller
- diff --git a/managers.py b/managers.py
- index 8ddb8f9..510aa17 100644
- --- a/managers.py
- +++ b/managers.py
- @@ -4,8 +4,8 @@ from django.db import models
- from django.db.models import Q
- from itertools import chain
- from datetime import datetime
- -from evennia.typeclasses.managers import (TypedObjectManager, TypeclassManager,
- - returns_typeclass_list, returns_typeclass)
- +from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
- +#returns_typeclass_list, returns_typeclass
- _GA = object.__getattribute__
- _PlayerDB = None
- @@ -113,7 +113,8 @@ class PostQuerySet(models.query.QuerySet):
- """
- posts = self.by_board(board)
- for p in posts:
- - if player.read_posts.filter(pk=p.id).exists():
- + #### DEBUG ####
- + if account.read_posts.filter(pk=p.id).exists():
- setattr(p, "unread", False)
- else:
- setattr(p, "unread", True)
- @@ -153,11 +154,9 @@ class PostManager(TypedObjectManager):
- def get_queryset(self):
- return PostQuerySet(self.model, using=self._db)
- - @returns_typeclass
- def post(self, id):
- return self.get_queryset().get(pk=id)
- - @returns_typeclass_list
- def posts(self, board, player=None):
- """
- Given a board and an optional player, returns the posts
- @@ -174,7 +173,6 @@ class PostManager(TypedObjectManager):
- else:
- return self.get_queryset().by_board_for_player(board, player)
- - @returns_typeclass_list
- def threads(self, board, player=None):
- """
- Given a board and an optional player, return the threads.
- @@ -188,7 +186,6 @@ class PostManager(TypedObjectManager):
- """
- return self.get_queryset().by_board_threaded_player(board, player)
- - @returns_typeclass_list
- def search(self, searchstring, board=None):
- if board:
- result = self.get_queryset().by_board(board).filter(db_text__icontains=searchstring).\
- @@ -209,7 +206,6 @@ class BoardDBManager(TypedObjectManager):
- """
- - @returns_typeclass_list
- def get_all_boards(self):
- """
- Returns all boards.
- @@ -219,11 +215,9 @@ class BoardDBManager(TypedObjectManager):
- """
- return self.all()
- - @returns_typeclass
- def get_board_id(self, id):
- return self.get(pk=id)
- - @returns_typeclass
- def get_board(self, key):
- """
- Returns a specific board beginning with the key.
- @@ -248,7 +242,6 @@ class BoardDBManager(TypedObjectManager):
- except self.model.DoesNotExist:
- return None
- - @returns_typeclass
- def get_board_exact(self, key):
- """
- Returns a specific board matching the key.
- @@ -269,7 +262,6 @@ class BoardDBManager(TypedObjectManager):
- return None
- - @returns_typeclass_list
- def get_all_visible_boards(self, caller):
- """
- This function returns all the boards visible to a given viewer.
- @@ -300,7 +292,6 @@ class BoardDBManager(TypedObjectManager):
- return filtered
- - @returns_typeclass
- def get_visible_board(self, viewer, key):
- """
- This function returns a single board matching the key, provided it's unique.
- @@ -339,7 +330,6 @@ class BoardDBManager(TypedObjectManager):
- return None
- - @returns_typeclass_list
- def get_subscriptions(self, subscriber):
- """
- This function returns a list of boards a given user is subscribed to.
- diff --git a/models.py b/models.py
- index 433b443..116bc8a 100644
- --- a/models.py
- +++ b/models.py
- @@ -26,7 +26,7 @@ class Post(SharedMemoryModel):
- - db_text: The actual text of the post.
- """
- - db_poster_player = models.ForeignKey("players.PlayerDB", related_name="+", null=True, blank=True,
- + db_poster_player = models.ForeignKey("accounts.AccountDB", related_name="+", null=True, blank=True,
- verbose_name="poster(player)", db_index=True, help_text='Post origin (if player).')
- db_poster_object = models.ForeignKey("objects.ObjectDB", related_name="+", null=True, blank=True,
- verbose_name="poster(object)", db_index=True, help_text='Post origin (if object),')
- @@ -37,7 +37,7 @@ class Post(SharedMemoryModel):
- db_date_created = models.DateTimeField('date created', editable=False,
- auto_now_add=True, db_index=True, help_text='Date post was made.')
- db_pinned = models.BooleanField(verbose_name="pinned", help_text='Should the post remain visible even after expiration?')
- - db_readers = models.ManyToManyField("players.PlayerDB", related_name="read_posts", null=True, blank=True,
- + db_readers = models.ManyToManyField("accounts.AccountDB", related_name="read_posts", null=True, blank=True,
- verbose_name="readers", help_text='Players who have read this post.')
- db_parent = models.ForeignKey('Post', verbose_name='parent', related_name='replies', null=True, blank=True,
- help_text='Parent/child map for threaded replies.')
- @@ -221,7 +221,7 @@ class BoardDB(TypedObject):
- help_text='Maximum number of active/visible posts for this board.')
- db_expiry_duration = models.IntegerField('lifetime_days', blank=True, null=True,
- help_text='Maximum timeline in days for posts to live on this board.')
- - db_subscriptions = models.ManyToManyField('players.PlayerDB', blank=True, verbose_name='subscribers',
- + db_subscriptions = models.ManyToManyField('accounts.AccountDB', blank=True, verbose_name='subscribers',
- related_name='board_subscriptions',
- help_text='Players subscribed to this board.')
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
