slidge-whatsapp 0.2.2__tar.gz → 0.2.3__tar.gz

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: slidge-whatsapp
-Version: 0.2.2
+Version: 0.2.3
 Summary: A Whatsapp/XMPP gateway.
 License: GNU AFFERO GENERAL PUBLIC LICENSE
                                 Version 3, 19 November 2007
@@ -672,7 +672,7 @@ Requires-Dist: linkpreview (>=0.11.0)
 Requires-Dist: pybindgen (>=0.22.1)
 Requires-Dist: slidge (>=0.2.4)
 Project-URL: Chat room, https://conference.nicoco.fr:5281/muc_log/slidge/
-Project-URL: Documentation, https://slidge.codeberg.page/docs/slidge-whatsapp/main
+Project-URL: Documentation, https://slidge.im/docs/slidge-whatsapp/main
 Project-URL: Homepage, https://codeberg.org/slidge/slidge-whatsapp
 Project-URL: Issues, https://codeberg.org/slidge/slidge-whatsapp/issues
 Project-URL: Repository, https://codeberg.org/slidge/slidge-whatsapp
@@ -694,7 +694,7 @@ A
 
 ## Installation
 
-Refer to the [slidge admin documentation](https://slidge.im/core/admin/)
+Refer to the [slidge admin documentation](https://slidge.im/docs/slidge/main/admin/)
 for general info on how to set up an XMPP server component.
 
 ### Containers
@@ -702,8 +702,8 @@ for general info on how to set up an XMPP server component.
 From [the codeberg package registry](https://codeberg.org/slidge/-/packages?q=&type=container)
 
 ```sh
-# use ravermeister/slidge-whatsapp for arm64 (thanks raver! <3)
-docker run docker.io/nicocool84/slidge-whatsapp
+# use docker.io/ravermeister/slidge-whatsapp for arm64 (thanks raver! <3)
+docker run codeberg.org/slidge/slidge-whatsapp
 ```
 
 ### Python package

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/README.md

@@ -14,7 +14,7 @@ A
 
 ## Installation
 
-Refer to the [slidge admin documentation](https://slidge.im/core/admin/)
+Refer to the [slidge admin documentation](https://slidge.im/docs/slidge/main/admin/)
 for general info on how to set up an XMPP server component.
 
 ### Containers
@@ -22,8 +22,8 @@ for general info on how to set up an XMPP server component.
 From [the codeberg package registry](https://codeberg.org/slidge/-/packages?q=&type=container)
 
 ```sh
-# use ravermeister/slidge-whatsapp for arm64 (thanks raver! <3)
-docker run docker.io/nicocool84/slidge-whatsapp
+# use docker.io/ravermeister/slidge-whatsapp for arm64 (thanks raver! <3)
+docker run codeberg.org/slidge/slidge-whatsapp
 ```
 
 ### Python package

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "slidge-whatsapp"
-version = "v0.2.2"
+version = "v0.2.3"
 description = "A Whatsapp/XMPP gateway."
 authors = [
     {name = "nicoco", email = "nicoco@nicoco.fr"},
@@ -24,7 +24,7 @@ Homepage = "https://codeberg.org/slidge/slidge-whatsapp"
 Issues = "https://codeberg.org/slidge/slidge-whatsapp/issues"
 Repository = "https://codeberg.org/slidge/slidge-whatsapp"
 "Chat room" = "https://conference.nicoco.fr:5281/muc_log/slidge/"
-Documentation = "https://slidge.codeberg.page/docs/slidge-whatsapp/main"
+Documentation = "https://slidge.im/docs/slidge-whatsapp/main"
 
 [project.scripts]
 slidge-whatsapp = "slidge_whatsapp:main"
@@ -108,8 +108,9 @@ body = """
     {% for commit in commits %}
         - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
             {% if commit.breaking %}[**breaking**] {% endif %}\
-            {{ commit.message | upper_first }}\
-            {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif %}\
+            {{ commit.message | split(pat="\n") | first | upper_first | trim }}\
+            {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif %} \
+            [`{{ commit.id | truncate(length=7, end="") }}`](./commit/{{ commit.id }})\
     {% endfor %}
 {% endfor %}\n
 """
@@ -118,6 +119,8 @@ footer = """
 """
 
 [tool.git-cliff.git]
+conventional_commits = true
+filter_unconventional = false
 commit_parsers = [
   { message = "^feat", group = "<!-- 0 -->🚀 Features" },
   { message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/__init__.py

@@ -13,5 +13,5 @@ def main():
     entrypoint("slidge_whatsapp")
 
 
-__version__ = "v0.2.2"
+__version__ = "v0.2.3"
 __all__ = "Gateway", "session", "command", "contact", "config", "group", "main"

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/contact.py

@@ -57,7 +57,7 @@ class Roster(LegacyRoster[str, Contact]):
             avatar = self.session.whatsapp.GetAvatar(data.JID, contact.avatar or "")
             if avatar.URL and contact.avatar != avatar.ID:
                 await contact.set_avatar(avatar.URL, avatar.ID)
-            elif avatar.URL == "":
+            elif avatar.URL == "" and avatar.ID == "":
                 await contact.set_avatar(None)
         except RuntimeError as err:
             self.session.log.error(

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/event.go

@@ -578,6 +578,7 @@ func convertAttachment(attach *Attachment) error {
 			// these are some times misdetected as such.
 			if s.VideoWidth == 0 && s.VideoHeight == 0 && s.AudioSampleRate > 0 && s.Duration > 0 {
 				spec = voiceMessageSpec
+				spec.SourceMIME = media.TypeM4A
 			}
 		}
 	default:
@@ -586,6 +587,10 @@ func convertAttachment(attach *Attachment) error {
 	}
 
 	// Convert attachment between file-types, if source MIME matches the known list of convertable types.
+	if spec.SourceMIME == "" {
+		spec.SourceMIME = detectedMIME
+	}
+
 	data, err := media.Convert(ctx, attach.Data, &spec)
 	if err != nil {
 		return fmt.Errorf("failed converting attachment: %w", err)

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/group.py

@@ -25,14 +25,13 @@ class MUC(LegacyMUC[str, str, Participant, str]):
 
     HAS_DESCRIPTION = False
     REACTIONS_SINGLE_EMOJI = True
-    _ALL_INFO_FILLED_ON_STARTUP = True
 
     async def update_info(self):
         try:
             avatar = self.session.whatsapp.GetAvatar(self.legacy_id, self.avatar or "")
             if avatar.URL and self.avatar != avatar.ID:
                 await self.set_avatar(avatar.URL, avatar.ID)
-            elif avatar.URL == "":
+            elif avatar.URL == "" and avatar.ID == "":
                 await self.set_avatar(None)
         except RuntimeError as err:
             self.session.log.error(
@@ -95,6 +94,12 @@ class MUC(LegacyMUC[str, str, Participant, str]):
                 if name := participant.nickname:
                     self.subject_setter = name
         self.session.whatsapp_participants[self.legacy_id] = info.Participants
+        self.n_participants = len(info.Participants)
+        # Since whatsmeow does always emit a whatsapp.Group event even for participant changes,
+        # we need to do that to actually update the participant list.
+        if self._participants_filled:
+            async for _ in self.fill_participants():
+                pass
 
     async def fill_participants(self) -> AsyncIterator[Participant]:
         await self.session.bookmarks.ready

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/media/media.go

@@ -107,6 +107,8 @@ type Spec struct {
 	VideoHeight      int        // The height of the video stream, in pixels.
 	VideoFilter      string     // A complex filter to apply to the video stream.
 
+	Duration time.Duration // The duration of the audio or video stream.
+
 	ImageWidth     int // The width of the image, in pixels.
 	ImageHeight    int // The height of the image, in pixels.
 	ImageQuality   int // Image quality for lossy image formats, typically a value from 1 to 100.
@@ -114,8 +116,8 @@ type Spec struct {
 
 	DocumentPage int // The number of pages for the document.
 
-	Duration      time.Duration // The duration of the audio or video stream.
-	StripMetadata bool          // Whether or not to remove any container-level metadata present in the stream.
+	SourceMIME    MIMEType // The MIME type for the source data. If not set, this is derived from the source data.
+	StripMetadata bool     // Whether or not to remove any container-level metadata present in the stream.
 }
 
 // CommandLineArgs returns the current [Spec] as a list of command-line arguments meant for FFMPEG
@@ -216,7 +218,10 @@ func (s Spec) commandLineArgs() ([]string, error) {
 // specification given. For information on how these definitions affect media conversions, see the
 // documentation for the [Spec] type.
 func Convert(ctx context.Context, data []byte, spec *Spec) ([]byte, error) {
-	var from, to = DetectMIMEType(data), spec.MIME.BaseMediaType()
+	var from, to = spec.SourceMIME, spec.MIME.BaseMediaType()
+	if from == "" {
+		from = DetectMIMEType(data)
+	}
 	switch from {
 	case TypeOgg, TypeM4A:
 		switch to {

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/session.go

@@ -535,15 +535,15 @@ func (s *Session) GetAvatar(resourceID, avatarID string) (Avatar, error) {
 	}
 
 	p, err := s.client.GetProfilePictureInfo(jid, &whatsmeow.GetProfilePictureParams{ExistingID: avatarID})
-	if err != nil &&
-		!errors.Is(err, whatsmeow.ErrProfilePictureNotSet) &&
-		!errors.Is(err, whatsmeow.ErrProfilePictureUnauthorized) {
+	if errors.Is(err, whatsmeow.ErrProfilePictureNotSet) || errors.Is(err, whatsmeow.ErrProfilePictureUnauthorized) {
+		return Avatar{}, nil
+	} else if err != nil {
 		return Avatar{}, fmt.Errorf("Could not get avatar: %s", err)
 	} else if p != nil {
 		return Avatar{ID: p.ID, URL: p.URL}, nil
 	}
 
-	return Avatar{}, nil
+	return Avatar{ID: avatarID}, nil
 }
 
 // SetAvatar updates the profile picture for the Contact or Group JID given; it can also update the

{slidge_whatsapp-0.2.2 → slidge_whatsapp-0.2.3}/slidge_whatsapp/session.py

@@ -590,30 +590,32 @@ class Session(BaseSession[str, Recipient]):
         if not match:
             return None
         url = match.group("url")
-        async with self.http.get(url) as resp:
-            if resp.status != 200:
-                self.log.debug(
-                    "Could not generate a preview for %s because response status was %s",
-                    url,
-                    resp.status,
-                )
-                return None
-            if resp.content_type != "text/html":
-                self.log.debug(
-                    "Could not generate a preview for %s because content type is %s",
-                    url,
-                    resp.content_type,
-                )
-                return None
-            try:
-                html = await resp.text()
-            except Exception as e:
-                self.log.debug("Could not generate a preview for %s", url, exc_info=e)
-                return None
-            preview = LinkPreview(Link(url, html))
-            if not preview.title:
-                return None
-            try:
+        try:
+            async with self.http.get(url) as resp:
+                if resp.status != 200:
+                    self.log.debug(
+                        "Could not generate a preview for %s because response status was %s",
+                        url,
+                        resp.status,
+                    )
+                    return None
+                if resp.content_type != "text/html":
+                    self.log.debug(
+                        "Could not generate a preview for %s because content type is %s",
+                        url,
+                        resp.content_type,
+                    )
+                    return None
+                try:
+                    html = await resp.text()
+                except Exception as e:
+                    self.log.debug(
+                        "Could not generate a preview for %s", url, exc_info=e
+                    )
+                    return None
+                preview = LinkPreview(Link(url, html))
+                if not preview.title:
+                    return None
                 thumbnail = (
                     await get_url_bytes(self.http, preview.image)
                     if preview.image
@@ -635,9 +637,9 @@ class Session(BaseSession[str, Recipient]):
                         else go.Slice_byte()
                     ),
                 )
-            except Exception as e:
-                self.log.debug("Could not generate a preview for %s", url, exc_info=e)
-                return None
+        except Exception as e:
+            self.log.debug("Could not generate a preview for %s", url, exc_info=e)
+            return None
 
     async def __get_location(self, text: str) -> Optional[whatsapp.Location]:
         match = search(GEO_URI_SEARCH_REGEX, text)