@quenty/friendutils 7.0.0-canary.331.7eefa75.0 → 7.0.0

package/CHANGELOG.md

@@ -3,7 +3,133 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [7.0.0-canary.331.7eefa75.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.1.0...@quenty/friendutils@7.0.0-canary.331.7eefa75.0) (2023-02-27)
+# [7.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.15.0...@quenty/friendutils@7.0.0) (2023-10-11)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.15.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.14.0...@quenty/friendutils@6.15.0) (2023-09-21)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.14.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.13.0...@quenty/friendutils@6.14.0) (2023-09-04)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.13.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.12.0...@quenty/friendutils@6.13.0) (2023-08-23)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.12.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.11.0...@quenty/friendutils@6.12.0) (2023-07-28)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.11.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.10.0...@quenty/friendutils@6.11.0) (2023-07-15)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.10.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.9.0...@quenty/friendutils@6.10.0) (2023-06-17)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.8.0...@quenty/friendutils@6.9.0) (2023-05-26)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.7.0...@quenty/friendutils@6.8.0) (2023-05-08)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.6.0...@quenty/friendutils@6.7.0) (2023-04-24)
+
+
+### Bug Fixes
+
+* Fix missing dependencies ([3fbd817](https://github.com/Quenty/NevermoreEngine/commit/3fbd817b1fee45bda1b963b61a6ed22b0db12b82))
+
+
+
+
+
+# [6.6.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.5.1...@quenty/friendutils@6.6.0) (2023-04-10)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+## [6.5.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.5.0...@quenty/friendutils@6.5.1) (2023-04-07)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.5.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.4.0...@quenty/friendutils@6.5.0) (2023-04-03)
+
+
+### Features
+
+* RxFriendUtils is available on server ([2d90850](https://github.com/Quenty/NevermoreEngine/commit/2d90850b5926fc953fd4875b8c6d243946291bf7))
+
+
+
+
+
+# [6.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.3.0...@quenty/friendutils@6.4.0) (2023-03-31)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.2.0...@quenty/friendutils@6.3.0) (2023-03-05)
+
+**Note:** Version bump only for package @quenty/friendutils
+
+
+
+
+
+# [6.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/friendutils@6.1.0...@quenty/friendutils@6.2.0) (2023-02-27)
 
 **Note:** Version bump only for package @quenty/friendutils
 

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2022 Quenty
+Copyright (c) 2014-2023 James Onnen (Quenty)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/friendutils",
-  "version": "7.0.0-canary.331.7eefa75.0",
+  "version": "7.0.0",
   "description": "Utlity functions to help find friends of a user. Also contains utility to make testing in studio easier.",
   "keywords": [
     "Roblox",
@@ -25,11 +25,14 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/loader": "6.1.0",
-    "@quenty/promise": "7.0.0-canary.331.7eefa75.0"
+    "@quenty/brio": "^9.0.0",
+    "@quenty/loader": "^7.0.0",
+    "@quenty/maid": "^2.6.0",
+    "@quenty/promise": "^7.0.0",
+    "@quenty/rx": "^8.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7eefa756f8bd892b1210349a8133d6d56992dffb"
+  "gitHead": "fdeae46099587019ec5fc15317dc673aed379400"
 }

package/src/{Client → Shared}/RxFriendUtils.lua

@@ -20,9 +20,14 @@ local RxFriendUtils = {}
 	The lifetimes exist for the whole duration another player is a friend and in your server.
 	This means if a player is unfriended + friended multiple times per session, they will have emitted multiple friend lifetimes.
 
+	@param player Player | nil
 	@return Observable<Brio<Player>>
 ]=]
-function RxFriendUtils.observeFriendsInServerAsBrios()
+function RxFriendUtils.observeFriendsInServerAsBrios(player)
+	player = player or Players.LocalPlayer
+
+	assert(typeof(player) == "Instance", "Bad player")
+
 	-- Note that 'PlayerFriendedEvent' and 'PlayerUnfriendedEvent' are currently unreliable.
 	-- See: https://devforum.roblox.com/t/getcores-playerfriendedevent-and-playerunfriendedevent-bindableevents-firing-at-inappropriate-times/570403/4
 	-- Due to players initially starting with an 'unknown' friend value, they fire for all players in the game at launch, and on the first time another player that joins the server.
@@ -49,43 +54,49 @@ function RxFriendUtils.observeFriendsInServerAsBrios()
 			end
 		end
 
-		-- Handle players leaving / joining.
-		maid:GiveTask(Players.PlayerRemoving:Connect(function(player: Player)
-			maid[player] = nil
-		end))
-		local function handleNewPlayer(otherPlayer: Player)
-			if otherPlayer ~= Players.LocalPlayer then
-				-- You can't be friends with yourself!
-				-- Pcall as :IsFriendsWith() could throw.
-				local success, isFriendsWith = pcall(function()
-					return Players.LocalPlayer:IsFriendsWith(otherPlayer.UserId)
+		local function handleNewPlayerAsync(otherPlayer: Player)
+			if otherPlayer ~= player then
+				local ok, isFriendsWith = pcall(function()
+					return player:IsFriendsWith(otherPlayer.UserId)
 				end)
-				if not success then
-					warn(("[RxFriendUtils] Couldn't get friendship status with %q!"):format(otherPlayer.Name))
+				if not ok then
+					warn(string.format("[RxFriendUtils.observeFriendsInServerAsBrios] Couldn't get friendship status with %q!",
+						otherPlayer.Name))
+
+					-- If the call failed, then 'isFriendsWith' will be nil.
+					-- We'll assume that this player isn't a friend on failure.
+					handleFriendState(otherPlayer, false)
+					return
 				end
-				-- If the call failed, then 'isFriendsWith' will be nil.
-				-- We'll assume that this player isn't a friend on failure.
+
 				handleFriendState(otherPlayer, isFriendsWith)
 			end
 		end
-		maid:GiveTask(Players.PlayerAdded:Connect(handleNewPlayer))
+
+		-- Handle players leaving / joining.
+		maid:GiveTask(Players.PlayerRemoving:Connect(function(otherPlayer: Player)
+			maid[otherPlayer] = nil
+		end))
+		maid:GiveTask(Players.PlayerAdded:Connect(handleNewPlayerAsync))
+
 		for _, otherPlayer in Players:GetPlayers() do
-			-- :IsFriendsWith() yields, so we call it in a new thread.
-			task.defer(handleNewPlayer, otherPlayer)
+			task.spawn(handleNewPlayerAsync, otherPlayer)
 		end
 
 		-- Handle changes for players already in this server.
 		-- There's a non-zero chance these get removed someday... :(
 		-- https://devforum.roblox.com/t/playerfriendedevent-was-deleted-from-corescripts/696683
 		-- So just incase these connections throw, use a new thread so we don't error out the whole observable.
-		task.spawn(function()
-			maid:GiveTask(StarterGui:GetCore("PlayerFriendedEvent").Event:Connect(function(player: Player)
-				handleFriendState(player, true)
-			end))
-			maid:GiveTask(StarterGui:GetCore("PlayerUnfriendedEvent").Event:Connect(function(player: Player)
-				handleFriendState(player, false)
-			end))
-		end)
+		if player == Players.LocalPlayer then
+			task.spawn(function()
+				maid:GiveTask(StarterGui:GetCore("PlayerFriendedEvent").Event:Connect(function(otherPlayer: Player)
+					handleFriendState(otherPlayer, true)
+				end))
+				maid:GiveTask(StarterGui:GetCore("PlayerUnfriendedEvent").Event:Connect(function(otherPlayer: Player)
+					handleFriendState(otherPlayer, false)
+				end))
+			end)
+		end
 
 		return maid
 	end)