Skip to content

Commit 31d15e4

Browse files
authored
Merge pull request #531 from Quenty/users/quenty/wfyb
Bulk refactors and small bug fixes
2 parents 95918ba + 760eab8 commit 31d15e4

File tree

30 files changed

+60
-93
lines changed

30 files changed

+60
-93
lines changed

src/buttonhighlightmodel/src/Client/HandleHighlightModel.lua

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ local BaseObject = require("BaseObject")
1010
local Maid = require("Maid")
1111
local Blend = require("Blend")
1212
local Rx = require("Rx")
13+
local ValueObject = require("ValueObject")
1314

1415
local HandleHighlightModel = setmetatable({}, BaseObject)
1516
HandleHighlightModel.ClassName = "HandleHighlightModel"
@@ -18,17 +19,11 @@ HandleHighlightModel.__index = HandleHighlightModel
1819
function HandleHighlightModel.new()
1920
local self = setmetatable(BaseObject.new(), HandleHighlightModel)
2021

21-
self.IsMouseOver = Instance.new("BoolValue")
22-
self.IsMouseOver.Value = false
23-
self._maid:GiveTask(self.IsMouseOver)
22+
self.IsMouseOver = self._maid:Add(ValueObject.new(false, "boolean"))
2423

25-
self.IsMouseDown = Instance.new("BoolValue")
26-
self.IsMouseDown.Value = false
27-
self._maid:GiveTask(self.IsMouseDown)
24+
self.IsMouseDown = self._maid:Add(ValueObject.new(false, "boolean"))
2825

29-
self.IsHighlighted = Instance.new("BoolValue")
30-
self.IsHighlighted.Value = false
31-
self._maid:GiveTask(self.IsHighlighted)
26+
self.IsHighlighted = self._maid:Add(ValueObject.new(false, "boolean"))
3227

3328
self._maid:GiveTask(self.IsMouseDown.Changed:Connect(function()
3429
self:_updateHighlighted()

src/camera/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"@quenty/qframe": "file:../qframe",
3838
"@quenty/servicebag": "file:../servicebag",
3939
"@quenty/spring": "file:../spring",
40+
"@quenty/valueobject": "file:../valueobject",
4041
"@quenty/vector3utils": "file:../vector3utils"
4142
},
4243
"devDependencies": {

src/camera/src/Client/Controls/GamepadRotateModel.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ local require = require(script.Parent.loader).load(script)
99
local AccelTween = require("AccelTween")
1010
local BaseObject = require("BaseObject")
1111
local CameraGamepadInputUtils = require("CameraGamepadInputUtils")
12+
local ValueObject = require("ValueObject")
1213

1314
local GamepadRotateModel = setmetatable({}, BaseObject)
1415
GamepadRotateModel.__index = GamepadRotateModel
@@ -24,9 +25,7 @@ function GamepadRotateModel.new()
2425
self._rampVelocityX = AccelTween.new(25)
2526
self._rampVelocityY = AccelTween.new(25)
2627

27-
self.IsRotating = Instance.new("BoolValue")
28-
self.IsRotating.Value = false
29-
self._maid:GiveTask(self.IsRotating)
28+
self.IsRotating = self._maid:Add(ValueObject.new(false, "boolean"))
3029

3130
return self
3231
end

src/chatproviderservice/src/Server/Commands/ChatProviderCommandService.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function ChatProviderCommandService:Init(serviceBag)
2222

2323
-- External
2424
self._cmdrService = self._serviceBag:GetService(require("CmdrService"))
25+
self._permissionService = self._serviceBag:GetService(require("PermissionService"))
2526

2627
-- Internal
2728
self._chatProviderService = self._serviceBag:GetService(require("ChatProviderService"))

src/chatproviderservice/src/Shared/Binders/HasChatTagsBase.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ HasChatTagsBase.__index = HasChatTagsBase
1818
function HasChatTagsBase.new(player)
1919
local self = setmetatable(BaseObject.new(player), HasChatTagsBase)
2020

21-
self._lastChatTags = ValueObject.new(nil)
22-
self._maid:GiveTask(self._lastChatTags)
21+
self._lastChatTags = self._maid:Add(ValueObject.new(nil))
2322

2423
self._maid:GiveTask(task.defer(function()
2524
self._maid:GiveTask(self:_observeTagDataListBrio():Subscribe(function(brio)

src/colorpalette/src/Shared/Swatch/ColorSwatch.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ function ColorSwatch.new(color, vividness)
2626
self._color = ValueObject.new(Color3.new(0, 0, 0))
2727
self._maid:GiveTask(self._color)
2828

29-
self._vividness = ValueObject.new(nil)
30-
self._maid:GiveTask(self._vividness)
29+
self._vividness = self._maid:Add(ValueObject.new(nil))
3130

3231
self:SetBaseColor(color)
3332
self:SetVividness(vividness)

src/flipbook/src/Client/Player/FlipbookPlayer.lua

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,13 @@ function FlipbookPlayer.new(imageLabel)
2929

3030
assert(typeof(self._obj) == "Instance" and (self._obj:IsA("ImageLabel") or self._obj:IsA("ImageButton")), "Bad imageLabel")
3131

32-
self._isPlaying = ValueObject.new(false, "boolean")
33-
self._maid:GiveTask(self._isPlaying)
32+
self._isPlaying = self._maid:Add(ValueObject.new(false, "boolean"))
3433

35-
self._isBoomarang = ValueObject.new(false, "boolean")
36-
self._maid:GiveTask(self._isBoomarang)
34+
self._isBoomarang = self._maid:Add(ValueObject.new(false, "boolean"))
3735

38-
self._playData = ValueObject.new(nil)
39-
self._maid:GiveTask(self._playData)
36+
self._playData = self._maid:Add(ValueObject.new(nil))
4037

41-
self._flipbook = ValueObject.new(nil)
42-
self._maid:GiveTask(self._flipbook)
38+
self._flipbook = self._maid:Add(ValueObject.new(nil))
4339

4440
self._originalImage = self._obj.Image
4541
self._originalRectOffset = self._obj.ImageRectOffset

src/gameproductservice/src/Shared/Ownership/PlayerAssetOwnershipTracker.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function PlayerAssetOwnershipTracker:PromiseOwnsAsset(idOrKey)
130130
return Promise.resolved(true)
131131
end
132132
else
133-
warn(string.format("[PlayerAssetOwnershipTracker.PromiseOwnsAsset] - Nothing with key %q", tostring(idOrKey)))
133+
return Promise.rejected(string.format("[PlayerAssetOwnershipTracker.PromiseOwnsAsset] - Nothing with key %q", tostring(idOrKey)))
134134
end
135135

136136
-- Check actual callback querying Roblox

src/guivisiblemanager/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"@quenty/baseobject": "file:../baseobject",
2929
"@quenty/cancellabledelay": "file:../cancellabledelay",
3030
"@quenty/loader": "file:../loader",
31-
"@quenty/maid": "file:../maid"
31+
"@quenty/maid": "file:../maid",
32+
"@quenty/valueobject": "file:../valueobject"
3233
},
3334
"publishConfig": {
3435
"access": "public"

src/guivisiblemanager/src/Client/GuiVisibleManager.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ local HttpService = game:GetService("HttpService")
1414
local BaseObject = require("BaseObject")
1515
local Maid = require("Maid")
1616
local cancellableDelay = require("cancellableDelay")
17+
local ValueObject = require("ValueObject")
1718

1819
local GuiVisibleManager = setmetatable({}, BaseObject)
1920
GuiVisibleManager.ClassName = "GuiVisibleManager"
@@ -34,9 +35,7 @@ function GuiVisibleManager.new(promiseNewPane, maxHideTime)
3435

3536
self._nextDoNotAnimate = false
3637

37-
self._paneVisible = Instance.new("BoolValue")
38-
self._paneVisible.Value = false
39-
self._maid:GiveTask(self._paneVisible)
38+
self._paneVisible = self._maid:Add(ValueObject.new(false, "boolean"))
4039

4140
self._showHandles = {}
4241

0 commit comments

Comments
 (0)