Skip to content

Commit 76cf8fb

Browse files
committed
Fix star ratings for civitai stuff
(cherry picked from commit 38013c1)
1 parent f2051df commit 76cf8fb

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,11 @@ public override async Task OnLoadedAsync()
9797
new RecommendedModelItemViewModel
9898
{
9999
ModelVersion = model.ModelVersions.First(
100-
x => !x.BaseModel.Contains("Turbo", StringComparison.OrdinalIgnoreCase)
100+
x =>
101+
!x.BaseModel.Contains("Turbo", StringComparison.OrdinalIgnoreCase)
102+
&& !x.BaseModel.Contains("Lightning", StringComparison.OrdinalIgnoreCase)
101103
),
102-
Author = $"by {model.Creator.Username}",
104+
Author = $"by {model.Creator?.Username}",
103105
CivitModel = model
104106
}
105107
)

StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,11 @@
319319
Background="#66000000"
320320
FontSize="16"
321321
Foreground="{DynamicResource ThemeEldenRingOrangeColor}"
322-
Value="{Binding CivitModel.Stats.Rating}" />
322+
Value="{Binding CivitModel.ModelVersionStats.Rating}" />
323323
<TextBlock
324324
Margin="4,0,0,0"
325325
VerticalAlignment="Center"
326-
Text="{Binding CivitModel.Stats.RatingCount}"
326+
Text="{Binding CivitModel.ModelVersionStats.RatingCount}"
327327
TextAlignment="Center" />
328328
</StackPanel>
329329

@@ -336,7 +336,7 @@
336336
<TextBlock
337337
Margin="4,0"
338338
VerticalAlignment="Center"
339-
Text="{Binding CivitModel.Stats.FavoriteCount, Converter={StaticResource KiloFormatterConverter}}" />
339+
Text="{Binding CivitModel.ModelVersionStats.FavoriteCount, Converter={StaticResource KiloFormatterConverter}}" />
340340

341341
<avalonia:Icon Margin="4,0" Value="fa-solid fa-download" />
342342
<TextBlock

StabilityMatrix.Avalonia/Views/Dialogs/RecommendedModelsDialog.axaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@
110110
Background="#66000000"
111111
FontSize="16"
112112
Foreground="{DynamicResource ThemeEldenRingOrangeColor}"
113-
Value="{Binding CivitModel.Stats.Rating}" />
113+
Value="{Binding ModelVersion.Stats.Rating}" />
114114
<TextBlock
115115
Margin="4,0,0,0"
116116
VerticalAlignment="Center"
117-
Text="{Binding CivitModel.Stats.RatingCount}"
117+
Text="{Binding ModelVersion.Stats.RatingCount}"
118118
TextAlignment="Center" />
119119
</StackPanel>
120120
</StackPanel>

StabilityMatrix.Core/Models/Api/CivitModel.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ public FileSizeType FullFilesSize
4848
var latestVersion = ModelVersions?.FirstOrDefault();
4949
if (latestVersion?.Files != null && latestVersion.Files.Any())
5050
{
51-
var latestModelFile = latestVersion.Files.FirstOrDefault(
52-
x => x.Type == CivitFileType.Model
53-
);
51+
var latestModelFile = latestVersion.Files.FirstOrDefault(x => x.Type == CivitFileType.Model);
5452
kbs = latestModelFile?.SizeKb ?? 0;
5553
}
5654
fullFilesSize = new FileSizeType(kbs);
@@ -65,4 +63,7 @@ public FileSizeType FullFilesSize
6563
ModelVersions != null && ModelVersions.Any()
6664
? ModelVersions[0].BaseModel?.Replace("SD", "").Trim()
6765
: string.Empty;
66+
67+
public CivitModelStats ModelVersionStats =>
68+
ModelVersions != null && ModelVersions.Any() ? ModelVersions[0].Stats : new CivitModelStats();
6869
}

0 commit comments

Comments
 (0)