aioqzone 1.9.4.dev9__tar.gz → 1.9.5.dev4__tar.gz

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/.github/dependabot.yml

@@ -7,7 +7,7 @@ updates:
       interval: weekly
       day: saturday
 
-  - package-ecosystem: pip
+  - package-ecosystem: uv
     directory: "/"
     schedule:
       interval: daily

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioqzone
-Version: 1.9.4.dev9
+Version: 1.9.5.dev4
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Project-URL: Homepage, https://github.com/aioqzone/aioqzone
 Project-URL: Repository, https://github.com/aioqzone/aioqzone

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioqzone"
-version = "1.9.4.dev9"
+version = "1.9.5.dev4"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = [{ name = "aioqzone" }]
 maintainers = [
@@ -79,6 +79,12 @@ asyncio_default_fixture_loop_scope = "module"
 [tool.ruff]
 line-length = 99
 
+[tool.ruff.lint]
+ignore = [
+    "F403",  # 'from module import *' used; unable to detect undefined names
+    "F405",  # name may be undefined, or defined from star imports
+]
+
 [tool.pyright]
 pythonVersion = "3.9"
 pythonPlatform = "All"

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/src/aioqzone/api/h5/model.py

@@ -1,7 +1,8 @@
 import logging
+import typing as t
 from os import PathLike
 
-from pydantic import ValidationError
+from pydantic import HttpUrl, ValidationError
 from tenacity import AsyncRetrying, TryAgain, after_log, stop_after_attempt
 
 from aioqzone.api.login import Loginable
@@ -48,16 +49,17 @@ class QzoneH5API:
     async def call(self, api: QzoneApi[TyRequest, TyResponse]) -> TyResponse:
         params: t.Dict[str, t.Any] = api.params.build_params(self.login.uin)
         if api.http_method == "GET":
-            data = None
+            data = {}
         else:
-            data = params
+            data = dict(json=params) if api.is_json else dict(data=params)
             params = {}
 
         headers = dict(Referer=api.referer)
         if api.keep_alive:
             headers["Connection"] = "keep-alive"
-        if api.accept:
-            headers["Accept"] = api.accept
+        # if api.is_json:
+        #     headers["Content-Type"] = "application/json"
+        #     headers["Accept"] = "application/json"
 
         async for attempt in self._relogin_retry:
             with attempt:
@@ -75,9 +77,9 @@ class QzoneH5API:
                     api.http_method,
                     api.url,
                     params=params,
-                    data=data,
                     headers=headers,
                     cookies=self.login.cookie,
+                    **data,
                 ) as r:
                     r.raise_for_status()
                     obj = await api.response.response_to_object(r)
@@ -164,19 +166,99 @@ class QzoneH5API:
 
         return await self.call(cls(params=DolikeParam.model_validate(locals())))
 
+    @t.overload
     async def add_comment(
-        self, ownuin: int, fid: str, appid: int, content: str, private=False
-    ) -> AddCommentResp:
-        """Comment a feed.
+        self,
+        hostuin: int,
+        fid: str,
+        appid: int,
+        content: str,
+        *,
+        busi_param: t.Optional[dict] = None,
+        private: bool = False,
+    ) -> AddCommentResp: ...
+
+    @t.overload
+    async def add_comment(
+        self,
+        hostuin: int,
+        fid: str,
+        appid: int,
+        content: str,
+        photos: t.Sequence[HttpUrl],
+        *,
+        feedsType: int = 100,
+        private: bool = False,
+        abstime: t.Optional[int] = None,
+    ) -> AddCommentLegacyResp: ...
 
-        :param ownuin: Feed owner uin
+    async def add_comment(
+        self,
+        hostuin: int,
+        fid: str,
+        appid: int,
+        content: str,
+        photos: t.Optional[t.Sequence[HttpUrl]] = None,
+        busi_param: t.Optional[dict] = None,
+        *,
+        feedsType: int = 100,
+        private=False,
+        abstime: t.Optional[int] = None,
+    ) -> t.Union[AddCommentResp, AddCommentLegacyResp]:
+        """Comment a feed. If :obj:`photos` is given, the legacy comment api will be used.
+
+        :param hostuin: Feed owner uin
         :param fid: :term:`fid`
         :param appid: :term:`appid`
         :param content: comment content
+        :param photos: photos to be attached, usually returned by :meth:`.preupload_photos`
+        :param busi_param: optional encoded params from :obj:`FeedOperation.operation.busi_param`
+        :param abstime: required if `appid != 311`
         :param private: is private comment
+
+        .. seealso:: :meth:`.preupload_photos`, :meth:`.upload_pic`
+
+        .. versionchanged:: 1.9.5.dev1
+
+            added support for legacy comment api (with photos).
         """
+        if photos:
+            if appid == 311:
+                topicId = f"{hostuin}_{fid}__1"
+            else:
+                assert abstime, "abstime is required if appid != 311"
+                topicId = f"{hostuin}_{abstime}"
+            return await self.call(
+                AddCommentApiLegacy(
+                    params=AddCommentParamsLegacy.model_validate(locals(), from_attributes=True)
+                )
+            )
+
+        busi_param = busi_param or {}
         return await self.call(AddCommentApi(params=AddCommentParams.model_validate(locals())))
 
+    async def delete_comment(
+        self,
+        hostUin: int,
+        topicId: str,
+        commentId: int,
+        feedsType: int = 100,
+        commentUin: t.Optional[int] = None,
+    ) -> DeleteCommentResp:
+        """Delete a comment.
+
+        :param hostUin: Feed owner uin
+        :param topicId:
+        :param feedsType:
+        :param commentId: id of the comment to be deleted
+        :param commentUin: uin of the comment owner, default as None, means the login uin
+        """
+        if commentUin is None:
+            commentUin = self.login.uin
+        return await self.call(
+            DeleteCommentApi(params=DeleteCommentParams.model_validate(locals()))
+        )
+
     async def publish_mood(
         self,
         content: str,
@@ -187,9 +269,11 @@ class QzoneH5API:
         """Publish a feed.
 
         :param content: feed content
-        :param photos:
+        :param photos: photos to be attached, usually returned by :meth:`.preupload_photos`
         :param sync_weibo: sync to weibo, default to false
         :param ugc_right: access right, default to "Available to Everyone".
+
+        .. seealso:: :meth:`.preupload_photos`, :meth:`.upload_pic`
         """
         photos = photos or []
         return await self.call(
@@ -237,6 +321,12 @@ class QzoneH5API:
     async def preupload_photos(
         self, upload_pics: t.List[UploadPicResponse], cur_num=0, upload_hd=False
     ) -> PhotosPreuploadResponse:
+        """Preupload photos before publishing a feed.
+
+        :param upload_pics: List of :obj:`.UploadPicResponse`, usually returned by :meth:`.upload_pic`
+
+        .. seealso:: :meth:`.upload_pic`
+        """
         assert upload_pics
         return await self.call(
             PhotosPreuploadApi(params=PhotosPreuploadParams.model_validate(locals()))

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/src/aioqzone/model/api/__init__.py

@@ -19,12 +19,12 @@ class QzoneApi(BaseModel, t.Generic[TyRequest, TyResponse]):
     path: t.ClassVar[str]
 
     keep_alive: t.ClassVar[bool] = True
-    accept: t.ClassVar[t.Optional[str]] = None
+    is_json: t.ClassVar[bool] = False
     referer: str = "https://h5.qzone.qq.com/"
 
     attach_token: t.ClassVar[bool] = True
     login_required: t.ClassVar[bool] = True
-    params: TyRequest = Field(default_factory=QzoneRequestParams)
+    params: TyRequest = Field(default_factory=QzoneRequestParams)  # type: ignore
     response: t.ClassVar[t.Type[TyResponse]]  # type: ignore
 
     @property
@@ -74,7 +74,7 @@ class GetCountApi(QzoneApi[GetCountParams, FeedCount]):
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     host: t.ClassVar[str] = "https://mobile.qzone.qq.com"
     path: t.ClassVar[str] = "/feeds/mfeeds_get_count"
-    accept: t.ClassVar[str] = "application/json"
+    is_json: t.ClassVar[bool] = True
 
 
 class LikeApi(QzoneApi[DolikeParam, SingleReturnResp]):
@@ -91,6 +91,19 @@ class AddCommentApi(QzoneApi[AddCommentParams, AddCommentResp]):
     response: t.ClassVar = AddCommentResp
     http_method: t.ClassVar[TyHttpMethod] = "POST"
     path: t.ClassVar[str] = "/webapp/json/qzoneOperation/addComment"
+    is_json: t.ClassVar[bool] = True
+
+
+class AddCommentApiLegacy(QzoneApi[AddCommentParamsLegacy, AddCommentLegacyResp]):
+    response: t.ClassVar = AddCommentLegacyResp
+    http_method: t.ClassVar[TyHttpMethod] = "POST"
+    path: t.ClassVar[str] = "/proxy/domain/taotao.qzone.qq.com/cgi-bin/emotion_cgi_re_feeds"
+
+
+class DeleteCommentApi(QzoneApi[DeleteCommentParams, DeleteCommentResp]):
+    response: t.ClassVar = DeleteCommentResp
+    http_method: t.ClassVar[TyHttpMethod] = "POST"
+    path: t.ClassVar[str] = "/proxy/domain/taotao.qzone.qq.com/cgi-bin/emotion_cgi_delcomment_ugc"
 
 
 class ListFriendApi(QzoneApi):

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/src/aioqzone/model/api/feed.py

@@ -192,14 +192,22 @@ class FeedComment(BaseModel):
 
 class HasCommon(BaseModel):
     common: FeedCommon = Field(validation_alias="comm")
+    userinfo: UserInfo
 
     @property
     def abstime(self):
         return self.common.time
 
+    @property
+    def topicId(self):
+        """make topicId. for 311 feeds, it's made of uin and fid; for others, uin and time.
 
-class HasUserInfo(BaseModel):
-    userinfo: UserInfo
+        .. versionadded:: 1.9.5.dev1
+        """
+        if self.common.appid == 311:
+            fid: str = getattr(self, "fid", self.common.ugcrightkey)
+            return f"{self.userinfo.uin}_{fid}__1"
+        return f"{self.userinfo.uin}_{self.common.time}"
 
 
 class HasSummary(BaseModel):
@@ -227,13 +235,20 @@ class ShareInfo(BaseModel):
     #     return v
 
 
+class FeedOperation(BaseModel):
+    busi_param: dict = Field(default_factory=dict)
+    weixin_url: t.Union[HttpUrl, str] = Field(default="", union_mode="left_to_right")
+    qq_url: t.Union[HttpUrl, str] = Field(default="", union_mode="left_to_right")
+    share_info: ShareInfo = Field(default_factory=ShareInfo)
+
+
 class Share(BaseModel):
     common: t.Union[FeedCommon, ContentCommon] = Field(
         validation_alias="cell_comm", union_mode="left_to_right"
     )
 
 
-class FeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
+class FeedOriginal(HasFid, HasCommon, HasSummary, HasMedia):
     @model_validator(mode="before")
     def remove_prefix(cls, v: dict[str, t.Any]):
         return {k.removeprefix("cell_"): i for k, i in v.items()}
@@ -245,14 +260,12 @@ class FeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
         return v
 
 
-class FeedData(HasFid, HasCommon, HasSummary, HasMedia, HasUserInfo):
+class FeedData(HasFid, HasCommon, HasSummary, HasMedia):
     like: LikeInfo = Field(default_factory=LikeInfo)
 
     comment: FeedComment = Field(default_factory=FeedComment)
     original: t.Union[FeedOriginal, Share, None] = Field(default=None, union_mode="left_to_right")
-    share_info: ShareInfo = Field(
-        default_factory=ShareInfo, validation_alias=AliasPath("operation", "share_info")
-    )
+    operation: FeedOperation = Field(default_factory=FeedOperation)
 
     # forward_list
     visitor: Visitor = Field(default_factory=Visitor)

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/src/aioqzone/model/api/profile.py

@@ -10,16 +10,15 @@ from .feed import (
     CommentItem,
     FeedComment,
     FeedCommon,
+    FeedOperation,
     FeedPic,
     FeedSummary,
     HasFid,
     HasSummary,
-    HasUserInfo,
     LikeInfo,
     PhotoUrls,
     RightInfo,
     Share,
-    ShareInfo,
     UserInfo,
     Visitor,
 )
@@ -87,7 +86,7 @@ class ProfileComment(FeedComment):
     comments: t.List[ProfileCommentItem] = Field(default_factory=list)
 
 
-class ProfileFeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
+class ProfileFeedOriginal(HasFid, HasCommon, HasSummary, HasMedia):
     @model_validator(mode="before")
     def remove_prefix(cls, v: dict[str, t.Any]):
         return {k.removeprefix("cell_"): i for k, i in v.items()}
@@ -99,15 +98,13 @@ class ProfileFeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
         return v
 
 
-class ProfileFeedData(HasFid, HasCommon, HasSummary, HasMedia, HasUserInfo):
+class ProfileFeedData(HasFid, HasCommon, HasSummary, HasMedia):
     like: ProfileLikeInfo = Field(default_factory=ProfileLikeInfo)
 
     comment: ProfileComment = Field(default_factory=ProfileComment)
     original: t.Union[ProfileFeedOriginal, Share, None] = Field(
         default=None, union_mode="left_to_right"
     )
-    share_info: ShareInfo = Field(
-        default_factory=ShareInfo, validation_alias=AliasPath("operation", "share_info")
-    )
+    operation: FeedOperation = Field(default_factory=FeedOperation)
 
     visitor: Visitor = Field(default_factory=Visitor)

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/src/aioqzone/model/api/request.py

@@ -5,7 +5,7 @@ from math import floor
 from os import PathLike
 from time import time
 
-from pydantic import BaseModel, Field, field_serializer, field_validator
+from pydantic import BaseModel, Field, HttpUrl, field_serializer, field_validator
 from typing_extensions import Buffer
 
 from aioqzone.utils.time import time_ms
@@ -23,6 +23,8 @@ __all__ = [
     "GetCountParams",
     "DolikeParam",
     "AddCommentParams",
+    "AddCommentParamsLegacy",
+    "DeleteCommentParams",
     "PublishMoodParams",
     "DeleteUgcParams",
     "UploadPicParams",
@@ -93,18 +95,6 @@ class DolikeParam(QzoneRequestParams):
     format: str = "purejson"
 
 
-class AddCommentParams(QzoneRequestParams):
-    uin_fields = ("uin",)
-    ownuin: int
-    fid: str = Field(serialization_alias="srcId")
-    private: int = Field(serialization_alias="isPrivateComment")
-    content: str = Field(min_length=1, max_length=2000)
-    appid: int = Field(default=311)
-
-    bypass_param: dict = Field(default_factory=dict)
-    busi_param: dict = Field(default_factory=dict)
-
-
 class PhotoData(BaseModel):
     albumid: str
     lloc: str
@@ -135,6 +125,61 @@ class PhotoData(BaseModel):
         return cls.model_validate(o, from_attributes=True)
 
 
+class AddCommentParams(QzoneRequestParams):
+    uin_fields = ("uin",)
+    hostuin: int = Field(serialization_alias="ownuin")
+    fid: str = Field(serialization_alias="srcId")
+    private: int = Field(serialization_alias="isPrivateComment")
+    content: str = Field(min_length=1, max_length=2000)
+    appid: int = Field(default=311)
+
+    bypass_param: dict = Field(default_factory=dict)
+    busi_param: dict = Field(default_factory=dict)
+
+
+class AddCommentParamsLegacy(QzoneRequestParams):
+    uin_fields = ("uin",)
+    hostuin: int
+    topicId: str
+    feedsType: int = 100
+    content: str = Field(min_length=1, max_length=2000)
+    photos: t.List[HttpUrl] = Field(default_factory=list, serialization_alias="richval")
+    private: int
+
+    # defaults
+    inCharset: str = "utf-8"
+    outCharset: str = "utf-8"
+    plat: str = "qzone"
+    source: str = "ic"
+    isSignIn: str = ""
+    format: str = "fs"
+    ref: str = "feeds"
+    richtype: str = "1"  # 1 if photos else empty
+    paramstr: str = "2"
+
+    @field_serializer("photos")
+    def richval(self, photos: t.List[HttpUrl]):
+        return " ".join(map(str, photos))
+
+
+class DeleteCommentParams(QzoneRequestParams):
+    uin_fields = ("uin",)
+    hostUin: int
+    topicId: str
+    feedsType: int = 100
+    commentId: int
+    commentUin: int
+
+    # defaults
+    inCharset: str = "utf-8"
+    outCharset: str = "utf-8"
+    plat: str = "qzone"
+    source: str = "ic"
+    format: str = "fs"
+    ref: str = "feeds"
+    paramstr: str = "2"
+
+
 class PublishMoodParams(QzoneRequestParams):
     uin_fields = ("res_uin",)
     content: str = Field(min_length=1, max_length=2000)

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/src/aioqzone/model/api/response.py

@@ -11,6 +11,7 @@ from pydantic import (
     Field,
     HttpUrl,
     TypeAdapter,
+    create_model,
     model_validator,
 )
 from tenacity import TryAgain
@@ -37,6 +38,8 @@ __all__ = [
     "FeedCount",
     "SingleReturnResp",
     "AddCommentResp",
+    "AddCommentLegacyResp",
+    "DeleteCommentResp",
     "PublishMoodResp",
     "DeleteUgcResp",
     "UploadPicResponse",
@@ -84,10 +87,10 @@ class QzoneResponse(BaseModel):
         if cls._data_key is None:
             return cls.model_validate(obj)
 
-        class data_wrapper(BaseModel):
-            data: cls = Field(validation_alias=cls._data_key)
-
-        return data_wrapper.model_validate(obj).data
+        data_wrapper = create_model(
+            "data_wrapper", data=(cls, Field(validation_alias=cls._data_key))
+        )
+        return getattr(data_wrapper.model_validate(obj), "data")
 
     @classmethod
     async def response_to_object(cls, response: ClientResponse) -> "StrDict":
@@ -191,16 +194,16 @@ class ProfilePagePesp(QzoneResponse):
             'body/script[@type="application/javascript"]'
         )
         if not scripts:
-            raise TryAgain("script tag not found")
+            raise TryAgain("ProfilePageResponse: script tag not found")
 
         texts: t.List[str] = [s.text for s in scripts]
         script = firstn(texts, lambda s: "shine0callback" in s)
         if not script:
-            raise TryAgain("data script not found")
+            raise TryAgain("ProfilePageResponse: script tag not found")
 
         m = re.search(r'window\.shine0callback.*return "([0-9a-f]+?)";', script)
         if m is None:
-            raise TryAgain("data script not found")
+            raise TryAgain("ProfilePageResponse: qzonetoken not found")
         qzonetoken = m.group(1)
 
         m = re.search(r"var FrontPage =.*?data\s*:\s*\[", script)
@@ -211,7 +214,7 @@ class ProfilePagePesp(QzoneResponse):
         data = json_loads(data)
         assert isinstance(data, list)
         if len(data) < 2:
-            raise TryAgain("profile not returned")
+            raise TryAgain("ProfilePageResponse: profile not returned")
 
         data = dict(zip(["info", "feedpage"], data))
         data["qzonetoken"] = qzonetoken
@@ -239,6 +242,48 @@ class AddCommentResp(QzoneResponse):
     commentLikekey: HttpUrl
 
 
+class AddCommentLegacyResp(QzoneResponse):
+    _data_key = None
+    smooth_policy: dict = Field(
+        default_factory=dict, validation_alias=AliasPath("result", "smoothpolicy")
+    )
+    feeds: str = ""
+
+    @classmethod
+    async def response_to_object(cls, response: ClientResponse):
+        html = await response.text()
+        scripts: t.List[HtmlElement] = document_fromstring(html).xpath(
+            'body/script[@type="text/javascript"]'
+        )
+        texts: t.List[str] = [s.text for s in scripts]
+        script = firstn(texts, lambda s: "frameElement.callback" in s)
+        if not script:
+            raise TryAgain("AddCommentLegacyResponse: script tag not found")
+
+        m = response_callback.search(script)
+        assert m
+        return validate_strdict(json_loads(m.group(1)))
+
+
+class DeleteCommentResp(QzoneResponse):
+    feeds: str = ""
+
+    @classmethod
+    async def response_to_object(cls, response: ClientResponse):
+        html = await response.text()
+        scripts: t.List[HtmlElement] = document_fromstring(html).xpath(
+            'body/script[@type="text/javascript"]'
+        )
+        texts: t.List[str] = [s.text for s in scripts]
+        script = firstn(texts, lambda s: "frameElement.callback" in s)
+        if not script:
+            raise TryAgain("DeleteCommentResponse: script tag not found")
+
+        m = response_callback.search(script)
+        assert m
+        return validate_strdict(json_loads(m.group(1)))
+
+
 class PublishMoodResp(QzoneResponse):
     ret: int = 0
     msg: str = ""
@@ -271,7 +316,9 @@ class PicInfo(QzoneResponse):
     pre: HttpUrl
     url: HttpUrl
     sloc: str
+    """id of small picture"""
     lloc: str
+    """id of large picture"""
     width: int
     height: int
     albumid: str

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/test/api/conftest.py

@@ -21,14 +21,14 @@ if environ.get("CI") is None:
 @pytest_asyncio.fixture(loop_scope="module", params=loginman_list)
 async def man(request, client: ClientAdapter, env: test_env):
     if request.param == "up":
-        return UpLoginManager(
+        man = UpLoginManager(
             client,
             config=UpLoginConfig.model_validate(
                 dict(uin=env.uin, pwd=env.password, fake_ip="8.8.8.8")
             ),
         )
 
-    if request.param == "qr":
+    elif request.param == "qr":
         from aioqzone.api import QrLoginConfig, QrLoginManager
 
         man = QrLoginManager(client, config=QrLoginConfig(uin=env.uin))
@@ -36,4 +36,20 @@ async def man(request, client: ClientAdapter, env: test_env):
             lambda png, times, qr_renew=False: image.open(io.BytesIO(png)).show() if png else None
         )
 
-        return man
+    else:
+        raise ValueError(f"Unknown login manager: {request.param}")
+
+    if cookie := environ.get("AIOQZONE_COOKIES"):
+        try:
+            from yaml import safe_load as load
+        except ImportError:
+            from json import load
+        from pathlib import Path
+
+        if Path(cookie).exists():
+            with open(cookie, encoding="utf-8") as f:
+                try:
+                    man.cookie = load(f) or {}
+                except BaseException:
+                    pass
+    return man

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/test/api/test_h5.py

@@ -61,16 +61,11 @@ async def upload_photos(api: QzoneH5API):
 
 async def qzone_workflow(api: QzoneH5API):
     await flow_wo_check(api)
-    info = await upload_photos(api)
+    picinfo = await upload_photos(api)
 
     feed = await api.publish_mood(
-        MOOD_TEXT, photos=info, sync_weibo=False, ugc_right=UgcRight.self
+        MOOD_TEXT, photos=picinfo, sync_weibo=False, ugc_right=UgcRight.self
     )
-    ownuin, appid = api.login.uin, 311
-    unikey = LikeData.persudo_unikey(appid, ownuin, feed.fid)
-
-    comment = await api.add_comment(ownuin, feed.fid, appid, COMMENT_TEXT)
-    await api.internal_dolike_app(appid, unikey, curkey=unikey)
 
     feed_flow = await api.get_active_feeds()
     feed_dict = {i.fid: i for i in feed_flow.vFeeds}
@@ -79,26 +74,41 @@ async def qzone_workflow(api: QzoneH5API):
     fetched_feed = feed_dict[feed.fid]
     assert fetched_feed.common.right_info.ugc_right == UgcRight.self
     assert MOOD_TEXT in fetched_feed.summary.summary
+
+    ownuin, appid = api.login.uin, 311
+    unikey = LikeData.persudo_unikey(appid, ownuin, feed.fid)
+
+    comment = await api.add_comment(
+        ownuin, feed.fid, appid, COMMENT_TEXT, busi_param=fetched_feed.operation.busi_param
+    )
+    comment_pic = await api.add_comment(
+        ownuin, feed.fid, appid, COMMENT_TEXT, [i.url for i in picinfo]
+    )
+
+    await api.internal_dolike_app(appid, unikey, curkey=unikey)
+
+    detail = await api.shuoshuo(
+        fetched_feed.fid, fetched_feed.userinfo.uin, fetched_feed.common.appid
+    )
     # BUG: dolike returns `succ` but has no effect. the fetched `isliked` is False.
     # So this assertion is disabled temperorily. FIXME!
-    # assert fetched_feed.like.isliked
-    assert fetched_feed.comment.comments
+    # assert detail.like.isliked
+    assert detail.comment.comments
 
-    comment_dict = {i.commentid: i for i in fetched_feed.comment.comments}
+    comment_dict = {i.commentid: i for i in detail.comment.comments}
     assert comment.commentid in comment_dict
 
     fetched_comment = comment_dict[comment.commentid]
     assert fetched_comment.commentLikekey == comment.commentLikekey
     assert COMMENT_TEXT in fetched_comment.content
 
-    detail = await api.shuoshuo(feed.fid, ownuin, appid)
     assert not detail.hasmore
     assert detail.summary.summary == fetched_feed.summary.summary
-    assert detail.like.isliked == fetched_feed.like.isliked
-    assert detail.comment.comments
-    assert comment.commentid in [i.commentid for i in detail.comment.comments]
+    # assert detail.like.isliked == fetched_feed.like.isliked
 
     count1 = await api.mfeeds_get_count()
+    await api.delete_comment(ownuin, fetched_feed.topicId, comment.commentid)
+
     delete = await api.delete_ugc(feed.fid, appid)
     count2 = delete.undeal_info
 

{aioqzone-1.9.4.dev9 → aioqzone-1.9.5.dev4}/uv.lock

@@ -116,7 +116,7 @@ wheels = [
 
 [[package]]
 name = "aioqzone"
-version = "1.9.4.dev9"
+version = "1.9.5.dev4"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },