slidge-whatsapp 0.2.5__cp311-cp311-manylinux_2_36_aarch64.whl → 0.3.0b0__cp311-cp311-manylinux_2_36_aarch64.whl

slidge_whatsapp/group.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, AsyncIterator, Optional
 
 from slidge.group import LegacyBookmarks, LegacyMUC, LegacyParticipant, MucType
 from slidge.util.archive_msg import HistoryMessage
-from slidge.util.types import Hat, HoleBound, Mention, MucAffiliation
+from slidge.util.types import Avatar, Hat, HoleBound, Mention, MucAffiliation
 from slixmpp.exceptions import XMPPError
 
 from .generated import go, whatsapp
@@ -28,9 +28,12 @@ class MUC(LegacyMUC[str, str, Participant, str]):
 
     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)
+            unique_id = ""
+            if self.avatar is not None:
+                unique_id = self.avatar.unique_id or ""  # type:ignore[assignment]
+            avatar = self.session.whatsapp.GetAvatar(self.legacy_id, unique_id)
+            if avatar.URL and unique_id != avatar.ID:
+                await self.set_avatar(Avatar(url=avatar.URL, unique_id=avatar.ID))
             elif avatar.URL == "" and avatar.ID == "":
                 await self.set_avatar(None)
         except RuntimeError as err:
@@ -60,9 +63,16 @@ class MUC(LegacyMUC[str, str, Participant, str]):
         self.session.whatsapp.RequestMessageHistory(self.legacy_id, oldest_message)
 
     def get_message_sender(self, legacy_msg_id: str):
-        assert self.pk is not None
-        stored = self.xmpp.store.mam.get_by_legacy_id(self.pk, legacy_msg_id)
-        if stored is None:
+        with self.xmpp.store.session() as orm:
+            try:
+                stored = next(
+                    self.xmpp.store.mam.get_messages(
+                        orm, self.stored.id, ids=[legacy_msg_id]
+                    )
+                )
+            except StopIteration:
+                stored = None
+        if not stored:
             raise XMPPError("internal-server-error", "Unable to find message sender")
         msg = HistoryMessage(stored.stanza)
         occupant_id = msg.stanza["occupant-id"]["id"]
@@ -87,17 +97,13 @@ class MUC(LegacyMUC[str, str, Participant, str]):
             if info.Subject.SetAt:
                 set_at = datetime.fromtimestamp(info.Subject.SetAt, tz=timezone.utc)
                 self.subject_date = set_at
-            if info.Subject.SetByJID:
-                participant = await self.get_participant_by_legacy_id(
-                    info.Subject.SetByJID
-                )
-                if name := participant.nickname:
-                    self.subject_setter = name
+            if info.Subject.SetBy:
+                self.subject_setter = info.Subject.SetBy
         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:
+        if self.participants_filled:
             async for _ in self.fill_participants():
                 pass
 
@@ -109,7 +115,12 @@ class MUC(LegacyMUC[str, str, Participant, str]):
             self.log.warning("No participants!")
             return
         for data in participants:
-            participant = await self.get_participant_by_legacy_id(data.JID)
+            if whatsapp.IsAnonymousJID(data.JID):
+                participant = await self.get_participant(data.JID)
+                if data.Nickname:
+                    participant.nickname = data.Nickname
+            else:
+                participant = await self.get_participant_by_legacy_id(data.JID)
             if data.Action == whatsapp.GroupParticipantActionRemove:
                 self.remove_participant(participant)
             else:
@@ -135,7 +146,7 @@ class MUC(LegacyMUC[str, str, Participant, str]):
             t,
             participants=(
                 {
-                    p.contact.jid_username: p.nickname
+                    p.contact.jid.username: p.nickname
                     async for p in self.get_participants()
                     if p.contact is not None  # should not happen
                 }
@@ -171,16 +182,14 @@ class MUC(LegacyMUC[str, str, Participant, str]):
         reason: Optional[str],
         nickname: Optional[str],
     ):
-        assert contact.contact_pk is not None
-        assert self.pk is not None
         if affiliation == "member":
-            if (
-                self.xmpp.store.participants.get_by_contact(self.pk, contact.contact_pk)
-                is not None
-            ):
-                action = whatsapp.GroupParticipantActionDemote
-            else:
+            participant = await self.get_participant_by_contact(contact, create=False)
+            if participant is None or participant.affiliation in ("outcast", "none"):
                 action = whatsapp.GroupParticipantActionAdd
+            elif participant.affiliation == "member":
+                return
+            else:
+                action = whatsapp.GroupParticipantActionDemote
         elif affiliation == "admin":
             action = whatsapp.GroupParticipantActionPromote
         elif affiliation == "outcast" or affiliation == "none":
@@ -232,12 +241,7 @@ class Bookmarks(LegacyBookmarks[str, MUC]):
             local_part.removeprefix("#") + "@" + whatsapp.DefaultGroupServer
         )
 
-        if (
-            self.xmpp.store.rooms.get_by_legacy_id(
-                self.session.user_pk, whatsapp_group_id
-            )
-            is None
-        ):
+        if not await self.by_legacy_id(whatsapp_group_id, create=False):
             raise XMPPError("item-not-found", f"No group found for {whatsapp_group_id}")
 
         return whatsapp_group_id

slidge_whatsapp/media/media.go

@@ -135,7 +135,11 @@ func (s Spec) commandLineArgs() ([]string, error) {
 			if s.AudioCodec != "" && s.AudioCodec != CodecOpus {
 				return nil, fmt.Errorf(errInvalidCodec, mime, CodecOpus, s.AudioCodec)
 			}
-			args = append(args, "-f", "ogg", "-c:a", "libopus")
+			args = append(args,
+				"-f", "ogg",
+				"-c:a", "libopus",
+				"-filter:a", "asetpts=N/SR/TB",
+			)
 		case TypeM4A:
 			if s.AudioCodec != "" && s.AudioCodec != CodecAAC {
 				return nil, fmt.Errorf(errInvalidCodec, mime, CodecAAC, s.AudioCodec)
@@ -268,14 +272,14 @@ func convertAudioVideo(ctx context.Context, data []byte, spec *Spec) ([]byte, er
 		return nil, err
 	}
 
-	defer os.Remove(in)
+	defer func() { _ = os.Remove(in) }()
 
 	out, err := createTempFile(nil)
 	if err != nil {
 		return nil, err
 	}
 
-	defer os.Remove(out)
+	defer func() { _ = os.Remove(out) }()
 
 	if err := ffmpeg(ctx, in, out, args...); err != nil {
 		return nil, err
@@ -330,7 +334,7 @@ func processImage(img image.Image, spec *Spec) ([]byte, error) {
 			o.Quality = jpeg.DefaultQuality
 		}
 
-		err = jpeg.Encode(&buf, img, nil)
+		err = jpeg.Encode(&buf, img, &o)
 	case TypePNG:
 		err = png.Encode(&buf, img)
 	}
@@ -364,12 +368,13 @@ func getAudioVideoSpec(ctx context.Context, data []byte) (*Spec, error) {
 		return nil, err
 	}
 
-	defer os.Remove(in)
+	defer func() { _ = os.Remove(in) }()
 	var result Spec
 
-	out, err := ffprobe(ctx, in,
-		"-show_entries", "stream=codec_name,width,height,sample_rate,duration",
-	)
+	out, err := ffprobe(ctx, in, "-show_entries", "stream=codec_name,width,height,sample_rate,duration")
+	if err != nil {
+		return nil, err
+	}
 
 	if s, ok := out["streams"].([]any); ok {
 		if len(s) == 0 {
@@ -475,7 +480,7 @@ func GetWaveform(ctx context.Context, data []byte, spec *Spec, maxSamples int) (
 		return nil, err
 	}
 
-	defer os.Remove(in)
+	defer func() { _ = os.Remove(in) }()
 
 	// Determine number of waveform to take based on duration and sample-rate of original file.
 	numSamples := strconv.Itoa(int(float64(spec.AudioSampleRate)*spec.Duration.Seconds()) / maxSamples)
@@ -485,6 +490,10 @@ func GetWaveform(ctx context.Context, data []byte, spec *Spec, maxSamples int) (
 		"-show_entries", "frame_tags=lavfi.astats.Overall.Peak_level",
 	)
 
+	if err != nil {
+		return nil, err
+	}
+
 	// Get waveform with defined maximum number of samples, and scale these from a range of 0 to 100.
 	var samples = make([]byte, 0, maxSamples)
 	if f, ok := out["frames"].([]any); ok {
@@ -532,13 +541,14 @@ func createTempFile(data []byte) (string, error) {
 		return "", fmt.Errorf("failed creating temporary file: %w", err)
 	}
 
-	defer f.Close()
+	defer func() { _ = f.Close() }()
+
 	if len(data) > 0 {
 		if n, err := f.Write(data); err != nil {
-			os.Remove(f.Name())
+			_ = os.Remove(f.Name())
 			return "", fmt.Errorf("failed writing to temporary file: %w", err)
 		} else if n < len(data) {
-			os.Remove(f.Name())
+			_ = os.Remove(f.Name())
 			return "", fmt.Errorf("failed writing to temporary file: incomplete write, want %d, write %d bytes", len(data), n)
 		}
 	}