feat: move Vote class

Author: null8626

README.md

@@ -110,7 +110,7 @@ def get_server_count() -> int:
 
 @client.autopost_success
 def success(server_count: int) -> None:
-  print(f'Successfully posted {server_count} servers to the API!')
+  print(f'Successfully posted {server_count} servers to Top.gg!')
 
 @client.autopost_error
 def error(error: topgg.Error) -> None:

docs/data.rst

@@ -4,5 +4,8 @@ Data reference
 .. autoclass:: topgg.models.Bot()
    :members:
 
+.. autoclass:: topgg.models.Vote()
+   :members:
+
 .. autoclass:: topgg.models.Voter()
    :members:

docs/webhooks.rst

@@ -4,8 +4,5 @@ Webhooks reference
 .. autoclass:: topgg.webhooks.Webhooks
    :members:
 
-.. autoclass:: topgg.webhooks.Vote()
-   :members:
-
 .. autodata:: topgg.webhooks.OnVoteCallback
 .. autodata:: topgg.webhooks.OnVoteDecorator

topgg/__init__.py

@@ -24,8 +24,8 @@
 """
 
 from .errors import Error, RequestError, Ratelimited
-from .models import Bot, SortBy, Voter
-from .webhooks import Vote, Webhooks
+from .models import Bot, SortBy, Vote, Voter
+from .webhooks import Webhooks
 from .widget import WidgetType
 from .version import VERSION
 from .client import Client

topgg/models.py

@@ -25,6 +25,7 @@
 
 from datetime import datetime, timezone
 from typing import Optional, TypeVar
+from urllib import parse
 from enum import Enum
 
 
@@ -40,6 +41,47 @@ def timestamp_from_id(id: int) -> datetime:
   return datetime.fromtimestamp(((id >> 22) + 1420070400000) // 1000, tz=timezone.utc)
 
 
+class Vote:
+  """A dispatched Top.gg vote event."""
+
+  __slots__ = ('receiver_id', 'voter_id', 'is_test', 'is_weekend', 'query')
+
+  receiver_id: int
+  """The ID of the Discord bot/server that received a vote."""
+
+  voter_id: int
+  """The ID of the Top.gg user who voted."""
+
+  is_test: bool
+  """Whether this vote is just a test done from the page settings."""
+
+  is_weekend: bool
+  """Whether the weekend multiplier is active, where a single vote counts as two."""
+
+  query: dict[str, str]
+  """Query strings found on the vote page."""
+
+  def __init__(self, json: dict):
+    guild = json.get('guild')
+
+    self.receiver_id = int(json.get('bot', guild))
+    self.voter_id = int(json['user'])
+    self.is_test = json['type'] == 'test'
+    self.is_weekend = bool(json.get('isWeekend'))
+
+    if query := json.get('query'):
+      self.query = {
+        k: v[0] for k, v in parse.parse_qs(parse.urlsplit(query).query).items()
+      }
+    else:
+      self.query = {}
+
+  def __repr__(self) -> str:
+    return (
+      f'<{__class__.__name__} receiver_id={self.receiver_id} voter_id={self.voter_id}>'
+    )
+
+
 class Voter:
   """A Top.gg voter."""
 

topgg/webhooks.py

@@ -28,53 +28,11 @@
 from typing import Any, Optional, Union
 from json import JSONDecodeError
 from inspect import isawaitable
-from urllib import parse
 
-
-RawCallback = Callable[[web.Request], Awaitable[web.StreamResponse]]
-
-
-class Vote:
-  """A dispatched Top.gg vote event."""
-
-  __slots__ = ('receiver_id', 'voter_id', 'is_test', 'is_weekend', 'query')
-
-  receiver_id: int
-  """The ID of the Discord bot/server that received a vote."""
-
-  voter_id: int
-  """The ID of the Top.gg user who voted."""
-
-  is_test: bool
-  """Whether this vote is just a test done from the page settings."""
-
-  is_weekend: bool
-  """Whether the weekend multiplier is active, where a single vote counts as two."""
-
-  query: dict[str, str]
-  """Query strings found on the vote page."""
-
-  def __init__(self, json: dict):
-    guild = json.get('guild')
-
-    self.receiver_id = int(json.get('bot', guild))
-    self.voter_id = int(json['user'])
-    self.is_test = json['type'] == 'test'
-    self.is_weekend = bool(json.get('isWeekend'))
-
-    if query := json.get('query'):
-      self.query = {
-        k: v[0] for k, v in parse.parse_qs(parse.urlsplit(query).query).items()
-      }
-    else:
-      self.query = {}
-
-  def __repr__(self) -> str:
-    return (
-      f'<{__class__.__name__} receiver_id={self.receiver_id} voter_id={self.voter_id}>'
-    )
+from .models import Vote
 
 
+RawCallback = Callable[[web.Request], Awaitable[web.StreamResponse]]
 OnVoteCallback = Callable[[Vote], Any]
 OnVoteDecorator = Callable[[OnVoteCallback], RawCallback]