be-components 7.4.0 → 7.4.3

package/src/BettorBot/components/ServerInfoCard.tsx

@@ -0,0 +1,73 @@
+import React, { useState } from 'react';
+import { Button, Text, View } from "../../Components/Themed";
+import type { AccessibleChannel, ServerInfo } from '../../types';
+import { FlatList, Image } from 'react-native';
+import { Checkbox, SearchBox } from '../../Components';
+import { useColors } from '../../constants/useColors';
+
+type ServerInfoProps = {
+    server:ServerInfo
+    selected_channels: string[],
+    onClose:() => void,
+    onSelectChannel: (channel_id:string) => void,
+    onDeselectChannel: (channel_id:string) => void 
+}
+const ServerInfoCard = ({ server, selected_channels, onDeselectChannel, onSelectChannel, onClose }:ServerInfoProps) => {
+    const Colors = useColors();
+    const [ channel_search, setChannelSearch ] = useState('');
+    const filtered_channels = server.accessibleChannels.filter(c => `${c.name}`.toLowerCase().includes(channel_search));
+
+    const renderChannels = (data: { item: AccessibleChannel, index:number }) => {
+        const selected = selected_channels.includes(data.item.id) ? true : false
+        return (
+             <View transparent type='row' style={{ padding:8, borderBottomWidth:1, borderColor:Colors.borders.light }}>
+                <Checkbox
+                    style={{ marginRight:10 }}
+                    checked={selected}
+                    onSelect={() => selected ? onDeselectChannel(data.item.id) : onSelectChannel(data.item.id)}
+                />
+                <View transparent style={{ flex:1, marginLeft:10 }}>
+                    <Text theme='h1'>{data.item.name}</Text>
+                </View>
+            </View>
+        )
+    }
+
+    return (
+        <View float style={{ flex:1 }}>
+            <View type='header' style={{ flexDirection:'row', alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
+              <Image
+                source={{ uri: server.icon ?? '' }}
+                style={{ height:40, width:40 }}
+              />
+              <View transparent style={{ flex:1, marginLeft:10 }}>
+                <Text theme='h1'>{server.name}</Text>
+                <Text theme='description' style={{ marginTop:3 }}>{server.description}</Text>
+              </View>
+            </View>
+            <View style={{ flex:1, padding:10 }}>
+                <Text theme='h1' style={{ marginBottom:10 }}>Select Channels Below</Text>
+                <View transparent style={{ padding:5 }}>
+                    <SearchBox onChange={(text) => setChannelSearch(text)} hide_search_button/>
+                </View>
+                <FlatList
+                    key={'channel_list'}
+                    data={filtered_channels.sort((a,b) => a.name.localeCompare(b.name))}
+                    renderItem={renderChannels}
+                    keyExtractor={(item) => item.id}
+                />
+            </View>
+            <View type='footer' style={{ flexDirection:'row', alignItems:'center', padding:10, borderBottomRightRadius:8, borderBottomLeftRadius:8 }}>
+              <Button
+                type='close'
+                title='CLOSE'
+                style={{ flex:1 }}
+                onPress={() => onClose()}
+              />
+            </View>
+        </View>
+    )
+
+}
+
+export default ServerInfoCard

package/src/BettorBot/index.tsx

@@ -0,0 +1,295 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Text, View } from "../Components/Themed"
+import { FlatList, Image } from 'react-native';
+import type { DiscordPlayerStatsProps, FocusPositionProps, MyPlayerProps, PublicPlayerProps, ServerInfo } from '../types';
+import { BettorBotApi } from './api';
+import Pagination from '../Components/Pagination';
+import { useColors } from '../constants/useColors';
+import { Checkbox, SearchBox } from '../Components';
+import moment from 'moment-mini';
+import ServerInfoCard from './components/ServerInfoCard';
+import BroadcastMessageCard from './components/BroadcastMessageCard';
+
+type BettorBotDashboardProps = {
+    me?:MyPlayerProps,
+    onFocusPosition?:(pos:FocusPositionProps) => void,
+}
+const PAGE_SIZE = 5
+const sections = ['broadcast', 'row_1', 'row_2']
+const BettorBotDashboard = ({ me, onFocusPosition }:BettorBotDashboardProps) => {
+    const Colors = useColors();
+    const [ size, setSize ] = useState({ width:0, height:0 });
+    const [ server_offset, setServerOffset ] = useState(0);
+    const [ server_search, setServerSearch ] = useState('');
+    const [ show_server_id, setShowServerId ] = useState<string|undefined>(undefined);
+    const [ player_offset, setPlayerOffset ] = useState(0);
+    const [ player_search, setPlayerSearch ] = useState('');
+    const [ selected_servers, setSelectedServers ] = useState<{ guild_id:string, channels:string[] }[]>([]);
+    const [ show_message, setShowMessage ] = useState(false);
+    const [ state, setState ] = useState<{
+        loading: boolean,
+        servers:ServerInfo[],
+        players:PublicPlayerProps[],
+        discord_player_stats:DiscordPlayerStatsProps[]
+    }>({
+        loading:false,
+        servers: [],
+        players:[],
+        discord_player_stats:[]
+    });
+    const { servers, discord_player_stats, players } = state;
+    const total_servers = servers.length
+    const total_channels = servers.reduce((a,b) => a + b.accessibleChannels.length, 0)
+    const total_members = servers.reduce((a,b) => a + b.memberCount, 0);
+    let filtered_servers = servers.sort((a,b) => b.memberCount - a.memberCount || a.name.localeCompare(b.name)).slice(server_offset * PAGE_SIZE, (server_offset * PAGE_SIZE) + PAGE_SIZE);
+    if(server_search){ filtered_servers = servers.filter(s => `${s.name}`.toLowerCase().includes(server_search.toLowerCase())).slice(server_offset * PAGE_SIZE, (server_offset * PAGE_SIZE) + PAGE_SIZE) }
+
+    const total_discord_players = discord_player_stats.reduce((a,b) => a + b.count, 0)
+    const connected = discord_player_stats.filter(s => s.status == 'active').reduce((a,b) => a + b.count, 0);
+    const not_connected = discord_player_stats.filter(s => s.status != 'active').reduce((a,b) => a + b.count, 0);
+
+    let filtered_players = players.sort((a,b) => a.username.localeCompare(b.username)).slice(player_offset * PAGE_SIZE, (player_offset * PAGE_SIZE) + PAGE_SIZE);
+    if(player_search){ filtered_players = players.filter(s => `${s.username}`.toLowerCase().includes(player_search.toLowerCase())).slice(player_offset * PAGE_SIZE, (player_offset * PAGE_SIZE) + PAGE_SIZE) }
+
+    const show_server = servers.find(s => s.id == show_server_id);
+    const selected_channel_count = selected_servers.reduce((a,b) => a + b.channels.length, 0);
+
+    useEffect(() => {
+        if(!me){ return }
+        if(me.role != 'admin'){ return alert('You are not authorized') }
+        BettorBotApi.setEnvironment();
+        getData();
+    },[me]);
+
+    const getData = async() => {
+        setState({ ...state, loading:true });
+        const resp = await BettorBotApi.getServers();
+        if(resp.error){ alert('Unable to get data') }
+        const dps = await BettorBotApi.getDiscordStats();
+        let player_ids:string[] = []
+        dps.map(p => p.player_ids.map(id => player_ids.push(id)));
+        let s_players = await BettorBotApi.getPlayersByPlayerIds(player_ids)
+        setState({
+            ...state,
+            servers: resp.servers,
+            discord_player_stats: dps,
+            players: s_players,
+            loading: false,
+
+        })
+    }
+
+    const renderPlayers = (data:{ item:PublicPlayerProps, index:number }) => {
+        return (
+            <View transparent type='row' style={{ padding:8, borderBottomWidth:1, borderColor:Colors.borders.light }}>
+                <Image
+                    source={{ uri: data.item.profile_pic ?? '' }}
+                    style={{ height:40, width:40 }}
+                    resizeMode='cover'
+                />
+                <View transparent style={{ flex:1, marginLeft:10 }}>
+                    <Text theme='h1'>{data.item.username}</Text>
+                    <Text theme='description' style={{ marginTop:3, maxWidth: size.width *0.7 }}>Joined {moment(data.item.create_datetime).fromNow()}</Text>
+                </View>
+            </View>
+        )
+    } 
+
+    const renderServers = (data:{ item:ServerInfo, index:number }) => {
+        const selected = selected_servers.find(s => s.guild_id == data.item.id) ? true : false
+        return (
+            <View transparent type='row' style={{ padding:8, borderBottomWidth:1, borderColor:Colors.borders.light }}>
+                <Checkbox
+                    style={{ marginRight:10 }}
+                    checked={selected}
+                    onSelect={() => {
+                        if(!selected){
+                            setSelectedServers(selected_servers.concat({ guild_id: data.item.id, channels: [] }));
+                            return setShowServerId(data.item.id);
+                        }
+                        setSelectedServers(selected_servers.filter(s => s.guild_id != data.item.id))
+                    }}
+                />
+                <Image
+                    source={{ uri: data.item.icon ?? '' }}
+                    style={{ height:40, width:40 }}
+                    resizeMode='cover'
+                />
+                <View transparent style={{ flex:1, marginLeft:10 }}>
+                    <Text theme='h1'>{data.item.name}</Text>
+                    <Text theme='description' style={{ marginTop:3, maxWidth: size.width *0.7 }}>{data.item.description}</Text>
+                </View>
+                <View transparent style={{ padding:5 }}>
+                    <Text theme='h1'>{data.item.memberCount}</Text>
+                    <Text theme='description' style={{ marginTop:3 }}>Members</Text>
+                </View>
+            </View>
+        )
+    }
+
+    const renderSections = (data: { item:string, index:number }) => {
+        switch(data.item){
+            case 'row_1':
+                return (
+                    <View style={{ flexDirection:'row', flexWrap:'wrap' }}>
+                        <View float style={{ margin:5, minWidth:150, flexGrow:1 }}>
+                            <View type='header' style={{ flexDirection:'row', alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
+                              <View transparent style={{ flex:1 }}>
+                                <Text theme='h1'>Bot Stats</Text>
+                              </View>
+                            </View>
+                            <View transparent style={{ padding:10 }}>
+                                <View transparent type='row' style={{ padding:5 }}>
+                                    <Text style={{ flex:1 }} theme='h2'>Total Servers</Text>
+                                    <Text theme='h1'>{total_servers}</Text>
+                                </View>
+                                <View transparent type='row' style={{ padding:5 }}>
+                                    <Text style={{ flex:1 }} theme='h2'>Total Channels</Text>
+                                    <Text theme='h1'>{total_channels}</Text>
+                                </View>
+                                <View transparent type='row' style={{ padding:5 }}>
+                                    <Text style={{ flex:1 }} theme='h2'>Total Members</Text>
+                                    <Text theme='h1'>{total_members}</Text>
+                                </View>
+                            </View>
+                        </View>
+                        <View float style={{ margin:5, minWidth:350, flexGrow:1 }}>
+                            <View type='header' style={{ flexDirection:'row', alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
+                              <View transparent style={{ flex:1 }}>
+                                <Text theme='h1'>Servers</Text>
+                                <Text style={{ marginTop:3 }} theme='description'>Select Servers to send message to below.</Text>
+                              </View>
+                              {selected_servers.length > 0 && selected_channel_count > 0 ?
+                              <Button type='action' style={{ padding:10 }} onPress={() => setShowMessage(true)}>
+                                <Text theme='description' color={Colors.text.white}>Send Message</Text>
+                                <Text style={{ marginTop:3 }} theme='light' color={Colors.text.white}>{selected_servers.length} Servers</Text>
+                              </Button>
+                              :<></>}
+                            </View>
+                            <View transparent>
+                                <View transparent style={{ padding:10 }}>
+                                    <SearchBox
+                                        hide_search_button
+                                        onChange={(text) => {
+                                            setServerSearch(text);
+                                            setServerOffset(0)
+                                        }}
+                                    />
+                                </View>
+                                <Pagination offset={server_offset} onNext={() => setServerOffset(server_offset + 1)} onPrevious={() => setServerOffset(server_offset - 1)} />
+                                <FlatList
+                                    data={filtered_servers.sort((a,b) => b.memberCount - a.memberCount || a.name.localeCompare(b.name))}
+                                    renderItem={renderServers}
+                                    keyExtractor={item => item.id}
+                                    key={'server_list'}
+                                />
+                            </View>
+                        </View>
+                    </View>
+                )
+            case 'row_2':
+                return (
+                     <View style={{ flexDirection:'row', flexWrap:'wrap' }}>
+                        <View float style={{ margin:5, minWidth:150, flexGrow:1 }}>
+                            <View type='header' style={{ flexDirection:'row', alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
+                              <View transparent style={{ flex:1 }}>
+                                <Text theme='h1'>Connection Stats</Text>
+                              </View>
+                            </View>
+                            <View transparent style={{ padding:10 }}>
+                                <View transparent type='row' style={{ padding:5 }}>
+                                    <Text style={{ flex:1 }} theme='h2'>Total Players</Text>
+                                    <Text theme='h1'>{total_discord_players}</Text>
+                                </View>
+                                <View transparent type='row' style={{ padding:5 }}>
+                                    <Text style={{ flex:1 }} theme='h2'>Fully Connected</Text>
+                                    <Text theme='h1'>{connected}</Text>
+                                </View>
+                                <View transparent type='row' style={{ padding:5 }}>
+                                    <Text style={{ flex:1 }} theme='h2'>Inactive</Text>
+                                    <Text theme='h1'>{not_connected}</Text>
+                                </View>
+                            </View>
+                        </View>
+                        <View float style={{ margin:5, minWidth:350, flexGrow:1 }}>
+                            <View type='header' style={{ flexDirection:'row', alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
+                              <View transparent style={{ flex:1 }}>
+                                <Text theme='h1'>Players</Text>
+                              </View>
+                            </View>
+                            <View transparent>
+                                <View transparent style={{ padding:10 }}>
+                                    <SearchBox
+                                        hide_search_button
+                                        onChange={(text) => {
+                                            setPlayerSearch(text);
+                                            setPlayerOffset(0)
+                                        }}
+                                    />
+                                </View>
+                                <Pagination offset={player_offset} onNext={() => setPlayerOffset(player_offset + 1)} onPrevious={() => setPlayerOffset(player_offset - 1)} />
+                                <FlatList
+                                    data={filtered_players.sort((a,b) => a.username.localeCompare(b.username))}
+                                    renderItem={renderPlayers}
+                                    keyExtractor={item => item.player_id.toString()}
+                                    key={'player_list'}
+                                />
+                            </View>
+                        </View>
+                    </View>
+                )
+            default: return <></>
+        }
+    }
+
+    return (
+        <View style={{ flex:1 }} onLayout={(ev) => {
+            const { height, width } = ev.nativeEvent.layout
+            setSize({ height, width })
+        }}>
+            <FlatList
+                data={sections}
+                key={'bot_sections'}
+                keyExtractor={item => item}
+                renderItem={renderSections}
+            />
+            {show_server ?
+            <View type='blur' style={{ position:'absolute', top:0, left:0, right:0, bottom:0, padding:10 }}>
+                <ServerInfoCard
+                    selected_channels={selected_servers.find(s => s.guild_id == show_server.id)?.channels ?? []}
+                    server={show_server}
+                    onClose={() => setShowServerId(undefined)}
+                    onSelectChannel={(channel_id) => {
+                        let guild = selected_servers.find(s => s.guild_id == show_server.id);
+                        if(!guild){ return alert('Error') }
+                        let channels = guild.channels.concat(channel_id);
+                        setSelectedServers(selected_servers.filter(s => s.guild_id != show_server.id).concat({ guild_id: show_server.id, channels }))
+                    }}
+                    onDeselectChannel={(channel_id) => {
+                        let guild = selected_servers.find(s => s.guild_id == show_server.id);
+                        if(!guild){ return alert('Error') }
+                        let channels = guild.channels.filter(id => id != channel_id);
+                        setSelectedServers(selected_servers.filter(s => s.guild_id != show_server.id).concat({ guild_id: show_server.id, channels }))
+                    }}
+                />
+            </View>
+            :<></>}
+            {show_message ?
+            <View type='blur' style={{ position:'absolute', top:0, left:0, right:0, bottom:0, padding:10 }}>
+                <BroadcastMessageCard
+                    selected_servers={selected_servers}
+                    servers={servers}
+                    onFocusPosition={onFocusPosition}
+                    onClose={() => setShowMessage(false)}
+                    onSendMessage={(_) => {
+                        setSelectedServers([])
+                        setShowMessage(false)
+                    }}
+                />
+            </View>
+            :<></>}
+        </View>
+    )
+}
+
+export default BettorBotDashboard

package/src/CreateEngagement/index.tsx

@@ -106,7 +106,10 @@ const CreateEngagement = ({ float, player, bracket_id, flash_campaign_id, init_e
             groups: my_grups.groups,
             companies: my_comps.companies,
             loading:false
-        })
+        });
+        if(act_company?.company_image?.url){
+            setDraftImage(act_company.company_image)
+        }
     }
     const errors = CreateEngagementHelpers.isStepValid(active_step, active_engagment, draft_competition, draft_squares, draft_flash, draft_bracket_competition);
 

package/src/FlashMarket/api/index.ts

@@ -116,6 +116,78 @@ export const FlashMarketHelpers = {
         if(!parimutuel_odds){ return 0 }
         return stake / parimutuel_odds
     },
+    updatePollOptionProbability: (
+    changingOptionId: string,
+    newProbability: number,
+    allOptions: PollOptionProps[]
+): PollOptionProps[] => {
+    const total = 1;
+    const minProb = 0.001; // minimum probability for unlocked options
+
+    // Clone and update changing option
+    const updatedOptions = allOptions.map(o =>
+        o.poll_option_id === changingOptionId
+            ? { ...o, initial_odds: newProbability }
+            : { ...o }
+    );
+
+    const lockedOptions = updatedOptions.filter(o => o.probability_locked);
+    const unlockedOptions = updatedOptions.filter(
+        o => !o.probability_locked && o.poll_option_id !== changingOptionId
+    );
+
+    const lockedSum = lockedOptions.reduce(
+        (sum, o) => sum + (o.initial_odds ?? 0),
+        0
+    );
+
+    const changedOption = updatedOptions.find(o => o.poll_option_id === changingOptionId);
+    if (!changedOption) return updatedOptions;
+
+    const oldProb = changedOption.initial_odds ?? 0;
+    //const delta = newProbability - oldProb; // positive if increasing, negative if decreasing
+
+    // Calculate the maximum allowed increase for the changing option
+    const maxForChanged = total - lockedSum - unlockedOptions.length * minProb;
+    changedOption.initial_odds = Math.min(Math.max(minProb, newProbability), maxForChanged);
+
+    const adjustedDelta = changedOption.initial_odds - oldProb;
+
+    // Remaining probability to redistribute among unlocked options
+    let remaining = total - lockedSum - changedOption.initial_odds;
+
+    if (unlockedOptions.length === 0) return updatedOptions;
+
+    // Redistribute probabilities
+    const finalOptions = updatedOptions.map(o => {
+        if (o.probability_locked || o.poll_option_id === changingOptionId) return o;
+
+        if (adjustedDelta < 0) {
+            // Changing option decreased → distribute evenly to others
+            const evenly = remaining / unlockedOptions.length;
+            return { ...o, initial_odds: Math.max(minProb, evenly) };
+        } else {
+            // Changing option increased → reduce proportionally
+            const sumUnlocked = unlockedOptions.reduce((sum, u) => sum + (u.initial_odds ?? 0), 0);
+            const proportion = (o.initial_odds ?? 0) / sumUnlocked;
+            const newOdds = Math.max(minProb, proportion * remaining);
+            return { ...o, initial_odds: newOdds };
+        }
+    });
+
+    // Fix rounding errors
+    const currentSum = finalOptions.reduce((sum, o) => sum + (o.initial_odds ?? 0), 0);
+    const roundingError = total - currentSum;
+
+    if (roundingError !== 0) {
+        const target = finalOptions.find(o => !o.probability_locked && o.poll_option_id !== changingOptionId);
+        if (target) {
+            target.initial_odds = Math.max(minProb, (target.initial_odds ?? 0) + roundingError);
+        }
+    }
+
+    return finalOptions;
+},
     isNewValid: (options:PollOptionProps[], summaries:PollSummaryProps[], poll?:PollProps) => {
         let errors:string[] = []
         if(!poll){ return ['Waiting for market'] }

package/src/FlashMarket/components/ManageFlashMarket.tsx

@@ -181,6 +181,15 @@ const ManageFlashMarket = ({ float, header_style, player, onClose, poll_id, onFo
     }
 
     const handleChangeProbability = (option:PollOptionProps, probability:number) => {
+        
+        const final_options = FlashMarketHelpers.updatePollOptionProbability(option.poll_option_id, probability, [ ...real_options ]);
+        setFlashState({
+            ...flash_state,
+            probability_changed: true,
+            poll_options: poll_options.filter(po => !final_options.find(fo => fo.poll_option_id == po.poll_option_id)).concat(final_options)
+        });
+        
+        /*
         if(option.probability_locked){ return }
         if(probability < 0){ return }
         if(probability > 1){ return }
@@ -249,6 +258,7 @@ const ManageFlashMarket = ({ float, header_style, player, onClose, poll_id, onFo
             probability_changed: true,
             poll_options: poll_options.filter(po => !final_options.find(fo => fo.poll_option_id == po.poll_option_id)).concat(final_options)
         });
+        */
     }
 
     const renderOptions = (data:{ item:PollOptionProps, index:number }) => {