Skip to content

Commit 9f1e82d

Browse files
committed
Follow PEP8
1 parent 7ee2270 commit 9f1e82d

7 files changed

Lines changed: 43 additions & 10 deletions

File tree

StealthIM/apis/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from . import common
22
from . import user
33
from . import util
4-
from . import group
4+
from . import group
5+
from . import message

StealthIM/apis/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class Result:
1111
code: int
1212
msg: str
1313

14+
1415
@dataclasses.dataclass
1516
class NoValResult:
1617
result: Result
@@ -58,4 +59,4 @@ async def request(
5859

5960
return response_data
6061
logger.error(f"Request to {url} failed after {retry} retries.")
61-
raise RuntimeError(f"Request failed with code: {response_data['result']['code']}")
62+
raise RuntimeError(f"Request failed with code: {response_data['result']['code']}")

StealthIM/apis/file.py

Whitespace-only changes.

StealthIM/apis/group.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,47 @@
11
import dataclasses
22
import enum
33

4-
from .common import request, Result, NoValResult
54
from StealthIM import logger
5+
from .common import request, Result, NoValResult
66

77

88
@dataclasses.dataclass
99
class GetGroupsResult:
1010
groups: list[int]
1111
result: Result
1212

13+
1314
class GroupMemberType(enum.Enum):
1415
Member = 0
1516
Manager = 1
1617
Owner = 2
1718

19+
1820
@dataclasses.dataclass
1921
class GroupMember:
2022
name: str
2123
type: GroupMemberType
2224

25+
2326
@dataclasses.dataclass
2427
class GroupInfoResult:
2528
members: list[GroupMember]
2629
result: Result
2730

31+
2832
@dataclasses.dataclass
2933
class GroupPublicInfoResult:
3034
create_at: str
3135
name: str
3236
result: Result
3337

38+
3439
@dataclasses.dataclass
3540
class CreateGroupResult:
3641
groupid: int
3742
result: Result
3843

44+
3945
JoinGroupResult = NoValResult
4046
InviteGroupResult = NoValResult
4147
SetMemberRoleResult = NoValResult
@@ -65,6 +71,7 @@ async def get_groups(
6571
)
6672
)
6773

74+
6875
async def get_group_info(
6976
url: str,
7077
session: str,
@@ -94,6 +101,7 @@ async def get_group_info(
94101
)
95102
)
96103

104+
97105
async def get_group_public_info(
98106
url: str,
99107
session: str,
@@ -117,6 +125,7 @@ async def get_group_public_info(
117125
)
118126
)
119127

128+
120129
async def create_group(
121130
url: str,
122131
session: str,
@@ -142,6 +151,7 @@ async def create_group(
142151
)
143152
)
144153

154+
145155
async def join_group(
146156
url: str,
147157
session: str,
@@ -167,6 +177,7 @@ async def join_group(
167177
)
168178
)
169179

180+
170181
async def invite_group(
171182
url: str,
172183
session: str,
@@ -192,6 +203,7 @@ async def invite_group(
192203
)
193204
)
194205

206+
195207
async def set_user_role(
196208
url: str,
197209
session: str,
@@ -218,6 +230,7 @@ async def set_user_role(
218230
)
219231
)
220232

233+
221234
async def kick_user(
222235
url: str,
223236
session: str,
@@ -240,6 +253,7 @@ async def kick_user(
240253
)
241254
)
242255

256+
243257
async def change_group_name(
244258
url: str,
245259
session: str,
@@ -265,6 +279,7 @@ async def change_group_name(
265279
)
266280
)
267281

282+
268283
async def change_group_password(
269284
url: str,
270285
session: str,

StealthIM/apis/message.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,15 @@ class MessageType(enum.Enum):
1515
LargeEmoji = 2
1616
Emoji = 3
1717
File = 4
18+
Card = 5
19+
InnerLink = 6
20+
Recall = 16
21+
1822

1923
SendMessageResult = NoValResult
2024
RecallMessageResult = NoValResult
2125

26+
2227
@dataclasses.dataclass
2328
class Message:
2429
groupid: int
@@ -57,6 +62,7 @@ async def send_message(
5762
)
5863
)
5964

65+
6066
async def recall_message(
6167
url: str,
6268
session: str,
@@ -91,7 +97,7 @@ async def get_message(
9197
direction: int
9298
):
9399
# noinspection PyStatementEffect
94-
direction # currently unused
100+
direction # currently unused
95101

96102
api_address = f'{url}/api/v1/message/{groupid}?msgid={from_id}'
97103
logger.debug(f"Called API get_message with url {api_address}")
@@ -125,4 +131,3 @@ async def get_message(
125131
username=msg["username"],
126132
hash=msg.get("hash", None),
127133
)
128-

StealthIM/apis/user.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import dataclasses
22
from typing import Optional
33

4-
from .common import Result, request, NoValResult
54
from StealthIM import logger
6-
5+
from .common import Result, request, NoValResult
76

87
RegisterResult = NoValResult
98

9+
1010
@dataclasses.dataclass
1111
class UserInfo:
1212
result: Result
@@ -16,17 +16,20 @@ class UserInfo:
1616
phone_number: str
1717
username: str
1818

19+
1920
@dataclasses.dataclass
2021
class LoginResult:
2122
result: Result
2223
session: Optional[str] = None
2324
user_info: Optional[UserInfo] = None
2425

26+
2527
@dataclasses.dataclass
2628
class UserPublicInfo:
2729
result: Result
2830
nickname: str
2931

32+
3033
ChangePasswordResult = NoValResult
3134
ChangeEmailResult = NoValResult
3235
ChangeNicknameResult = NoValResult
@@ -78,6 +81,7 @@ async def register(
7881
)
7982
)
8083

84+
8185
async def login(
8286
url: str,
8387
username: str,
@@ -122,7 +126,8 @@ async def login(
122126
),
123127
session=response_data.get("session"),
124128
user_info=info
125-
)
129+
)
130+
126131

127132
async def get_self_info(
128133
url: str,
@@ -158,6 +163,7 @@ async def get_self_info(
158163
username=response_data["user_info"]["username"]
159164
)
160165

166+
161167
async def get_user_info(
162168
url: str,
163169
session: str,
@@ -194,6 +200,7 @@ async def get_user_info(
194200
nickname=nickname
195201
)
196202

203+
197204
async def change_password(
198205
url: str,
199206
session: str,
@@ -228,6 +235,7 @@ async def change_password(
228235
)
229236
)
230237

238+
231239
async def change_email(
232240
url: str,
233241
session: str,
@@ -262,6 +270,7 @@ async def change_email(
262270
)
263271
)
264272

273+
265274
async def change_nickname(
266275
url: str,
267276
session: str,
@@ -296,6 +305,7 @@ async def change_nickname(
296305
)
297306
)
298307

308+
299309
async def change_phone_number(
300310
url: str,
301311
session: str,
@@ -330,6 +340,7 @@ async def change_phone_number(
330340
)
331341
)
332342

343+
333344
async def delete(
334345
url: str,
335346
session: str

StealthIM/apis/util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from StealthIM import logger
44

5+
56
async def ping(url: str) -> bool:
67
"""
78
Ping the server to check if it is reachable.
@@ -23,10 +24,9 @@ async def ping(url: str) -> bool:
2324
return False
2425
response_data = await response.json()
2526
logger.debug(f"Response data: {response_data}")
26-
if response_data != {"message":"Hello, StealthIM!"}:
27+
if response_data != {"message": "Hello, StealthIM!"}:
2728
return False
2829
except aiohttp.ClientError as e:
2930
logger.error(f"Ping failed with error: {e}")
3031
return False
3132
return True
32-

0 commit comments

Comments
 (0)