Browse Source

пельмень апдейт 3.5.7b

master
gsd 1 month ago
parent
commit
2cae3b8aca
  1. 2
      src/main/java/app/repositories/BanRepository.java
  2. 6
      src/main/java/app/repositories/KillfeedRepository.java

2
src/main/java/app/repositories/BanRepository.java

@ -18,7 +18,7 @@ public interface BanRepository extends PagingAndSortingRepository<Ban, Long> {
"(:begin_date is null or DATE_PART('EPOCH', b.timestamp) >= :begin_date) and " +
"(:end_date is null or :end_date <= DATE_PART('EPOCH', b.timestamp)) and " +
"(:active is null or b.active = :active) and " +
"(:admin_ids is null or b.unbanned_by_id in :admin_ids)")
"(:admin_ids is null or b.unbanned_by_id in :admin_ids) order by b.id desc")
Page<Ban> getBans(Pageable pageable,
@Param(value = "ban_ids")List<Long> ban_ids,
@Param(value = "account_ids") List<Long> account_ids,

6
src/main/java/app/repositories/KillfeedRepository.java

@ -24,7 +24,7 @@ public interface KillfeedRepository extends PagingAndSortingRepository<KillsInFe
@Query(value = "select k from KillsInFeed k where " +
"(:utime is null or k.utime >= :utime) and " +
"(:server_id is null or k.server_id like :server_id) and" +
"(:account_id is null or (k.attacker_id in :accounts_id and k.attacker_id != k.victim_id))")
"(:account_id is null or (k.attacker_id in :accounts_id and k.attacker_id != k.victim_id)) order by k.id desc")
Page<KillsInFeed> getKills(Pageable pageable,
@Param("accounts_id") List<Long> accounts_id,
@Param("server_id") String server_id,
@ -43,7 +43,7 @@ public interface KillfeedRepository extends PagingAndSortingRepository<KillsInFe
@Query(value = "select k from KillsInFeed k where " +
"(:utime is null or k.utime >= :utime) and " +
"(:server_id is null or k.server_id like :server_id) and" +
"(:account_id is null or (k.victim_id in :accounts_id and k.attacker_id != k.victim_id))")
"(:account_id is null or (k.victim_id in :accounts_id and k.attacker_id != k.victim_id)) order by k.id desc")
Page<KillsInFeed> getDeads(Pageable pageable,
@Param("accounts_id") List<Long> accounts_id,
@Param("server_id") String server_id,
@ -73,7 +73,7 @@ public interface KillfeedRepository extends PagingAndSortingRepository<KillsInFe
@Query(value = "select k from KillsInFeed k where " +
"(:utime is null or k.utime >= :utime) and " +
"(:server_id is null or k.server_id like :server_id) and" +
"(:account_id is null or k.assister_id in :accounts_id)")
"(:account_id is null or k.assister_id in :accounts_id) order by k.id desc")
Page<KillsInFeed> getAssists(Pageable pageable,
@Param("accounts_id") List<Long> accounts_id,
@Param("server_id") String server_id,

Loading…
Cancel
Save